From a3e7feffc29f79deda213e77750e4413fa75ae33 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Fri, 17 Nov 2023 08:49:41 +0900
Subject: [PATCH] Switch Windows 64-bit build from mingw64 to ucrt64

---
 .github/workflows/windows.yml     | 5 ++---
 README.md                         | 2 +-
 tools/installer/make-installer.sh | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 54331f9..f2a6e23 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -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
diff --git a/README.md b/README.md
index aecc4b1..214f6b9 100644
--- a/README.md
+++ b/README.md
@@ -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 ../../
diff --git a/tools/installer/make-installer.sh b/tools/installer/make-installer.sh
index 9ef9080..6351ac7 100755
--- a/tools/installer/make-installer.sh
+++ b/tools/installer/make-installer.sh
@@ -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:'