From 313b3f75881490bdeef18ae900657bd5881712fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Fri, 5 Jan 2024 16:10:23 +0100
Subject: [PATCH] Switch Windows build to 64bit binaries

Use the x86_64 compiler instead of i686 and use the version that uses
UCRT runtime. This is available by default on Windows 10 or newer and
can be installed on older OSes too.
---
 .github/workflows/build.yml | 4 ++--
 win32/collect-dlls.sh       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8edbc72..f4d1a3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,9 +47,9 @@ jobs:
     - name: Setup MSYS2 environment
       uses: msys2/setup-msys2@v2
       with:
-        msystem: MINGW32
+        msystem: UCRT64
         update: true
-        install: mingw-w64-i686-gcc automake autoconf pkg-config make zip mingw-w64-i686-poppler mingw-w64-i686-wxWidgets
+        install: mingw-w64-ucrt-x86_64-gcc automake autoconf pkg-config make zip mingw-w64-ucrt-x86_64-poppler mingw-w64-ucrt-x86_64-wxWidgets
 
     - name: Bootstrap
       run: ./bootstrap
diff --git a/win32/collect-dlls.sh b/win32/collect-dlls.sh
index 38bb4d4..710eb38 100755
--- a/win32/collect-dlls.sh
+++ b/win32/collect-dlls.sh
@@ -31,8 +31,8 @@ while true ; do
 
     cat $OUTPUT/*.objdeps | sort | uniq | while read i ; do
         dll=`echo $i`  # fixup weird line endings
-        if [[ -f /mingw32/bin/$dll ]] ; then
-            add_binary /mingw32/bin/$dll
+        if [[ -f /ucrt64/bin/$dll ]] ; then
+            add_binary /ucrt64/bin/$dll
         fi
     done
 done