Skip to content

Commit ae9a862

Browse files
committed
Upgrade MinGW-based libs to MinGW-w64 v8.0.0
I've compared the crucial {msvcr*,ucrtbase}.def.in files against v7.0.0, and they don't seem to feature any relevant changes. See http://mingw-w64.org/doku.php/versions for the changelog; Direct3D 12 is one of the additions.
1 parent aff9f8d commit ae9a862

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
variables:
3838
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
3939
# NB: update windows/build_mingw.sha256sums as well
40-
MINGW_VER: 7.0.0
40+
MINGW_VER: 8.0.0
4141
D_VERSION: 2.077.1
4242
steps:
4343
- template: .azure-pipelines/build-mingw-libs.yml

windows/build_mingw.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set ROOT=%CD%
44
mkdir "%ROOT%\artifacts"
55

6-
set TAG=mingw-libs-%MINGW_VER%-3
6+
set TAG=mingw-libs-%MINGW_VER%
77
set ARTIFACT=%TAG%.zip
88
set ARTIFACTPATH=%ROOT%\artifacts\%ARTIFACT%
99
set GITHUB_RELEASE=https://github.com/dlang/installer/releases/download/%TAG%/%ARTIFACT%

windows/build_mingw.sha256sums

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628 mingw-w64.tar.bz2
1+
44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762 mingw-w64.tar.bz2

windows/mingw/buildsdk.d

+9
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,15 @@ void sanitizeDef(string defFile)
164164
if (line == "ExtractIconW@")
165165
return ";ExtractIconW@";
166166

167+
// Apparent bugs in lib32/api-ms-win-appmodel-runtime-l1-1-1.def.
168+
if (line[$-1] == '@' &&
169+
(line == "VerifyApplicationUserModelId@" ||
170+
line == "VerifyPackageFamilyName@" ||
171+
line == "VerifyPackageFullName@" ||
172+
line == "VerifyPackageId@" ||
173+
line == "VerifyPackageRelativeApplicationId@"))
174+
return ";" ~ line;
175+
167176
return line;
168177
});
169178
}

0 commit comments

Comments
 (0)