Switch Windows 64-bit build from mingw64 to ucrt64

This commit is contained in:
kichikuou
2023-11-17 09:08:24 +09:00
parent a4c1dd1acf
commit a3e7feffc2
3 changed files with 6 additions and 7 deletions
+2 -3
View File
@@ -8,7 +8,7 @@ jobs:
matrix:
include:
- { sys: MINGW32, installer: "xsystem35-32bit" }
- { sys: MINGW64, installer: "xsystem35-64bit" }
- { sys: UCRT64, installer: "xsystem35-64bit" }
defaults:
run:
shell: msys2 {0}
@@ -19,7 +19,6 @@ jobs:
uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.sys }}
update: true
pacboy: >-
gcc:p
cmake:p
@@ -30,7 +29,7 @@ jobs:
libwebp:p
cjson:p
nsis:p
ntldd-git:p
ntldd:p
- name: Checkout
uses: actions/checkout@v3
+1 -1
View File
@@ -113,7 +113,7 @@ $ make && make install
[MSYS2](https://www.msys2.org) is required.
```bash
$ pacman -S cmake mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-libwebp mingw-w64-x86_64-cjson
$ pacman -S cmake mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-SDL2 mingw-w64-ucrt-x86_64-SDL2_ttf mingw-w64-ucrt-x86_64-SDL2_mixer mingw-w64-ucrt-x86_64-libwebp mingw-w64-ucrt-x86_64-cjson
$ mkdir -p out/debug
$ cd out/debug
$ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
+3 -3
View File
@@ -1,6 +1,6 @@
#!/bin/sh
# To use this script in MSYS2 shell, install mingw-w64-x86_64-nsis and
# mingw-w64-x86_64-ntldd-git packages.
# To use this script in MSYS2 shell, install mingw-w64-ucrt-x86_64-nsis and
# mingw-w64-ucrt-x86_64-ntldd packages.
if [ $# -ne 2 ]; then
echo 'Usage: make-installer.sh <build-dir> <nsi>'
@@ -11,7 +11,7 @@ builddir=$1
nsi=$2
echo 'dlls.nsi:'
ntldd -R $builddir/src/xsystem35.exe |perl -ne 'print "File \"$1\"\n" if /=> (.*) \(/' |grep mingw |tee $builddir/dlls.nsi
ntldd -R $builddir/src/xsystem35.exe |perl -ne 'print "File \"$1\"\n" if /=> (.*) \(/' |grep 'mingw32\|ucrt64' |tee $builddir/dlls.nsi
echo
echo 'dlls-uninstall.nsi:'