From 2f37e42b388a60e951c705d30aabe8f839ee49b6 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Wed, 9 Oct 2024 05:54:57 -0500
Subject: [PATCH] Add qt_arch variable to setup scripts, updating Windows to
 msvc2022

---
 setup-debug.bat   | 3 ++-
 setup-debug.sh    | 3 ++-
 setup-release.bat | 3 ++-
 setup-release.sh  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/setup-debug.bat b/setup-debug.bat
index f57d92f3..14e4f870 100644
--- a/setup-debug.bat
+++ b/setup-debug.bat
@@ -3,10 +3,11 @@ call tools\setup-common.bat
 set build_dir=build-debug
 set build_type=Debug
 set qt_version=6.8.0
+set qt_arch=msvc2022_64
 
 mkdir %build_dir%
 cmake -B %build_dir% -S . ^
     -DCMAKE_BUILD_TYPE=%build_type% ^
     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
-    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch%
 pause
diff --git a/setup-debug.sh b/setup-debug.sh
index 7516c1e8..4f9e72ea 100755
--- a/setup-debug.sh
+++ b/setup-debug.sh
@@ -4,6 +4,7 @@
 build_dir=${1:-build-debug}
 build_type=Debug
 qt_version=6.8.0
+qt_arch=gcc_64
 script_dir="$(dirname "$(readlink -f "$0")")"
 
 mkdir -p ${build_dir}
@@ -11,5 +12,5 @@ cmake -B ${build_dir} -S . \
 	-DCMAKE_BUILD_TYPE=${build_type} \
 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
-	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \
+	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \
 	-G Ninja
diff --git a/setup-release.bat b/setup-release.bat
index 316c50a7..cfcbd3c9 100644
--- a/setup-release.bat
+++ b/setup-release.bat
@@ -3,10 +3,11 @@ call tools\setup-common.bat
 set build_dir=build-release
 set build_type=Release
 set qt_version=6.8.0
+set qt_arch=msvc2022_64
 
 mkdir %build_dir%
 cmake -B %build_dir% -S . ^
     -DCMAKE_BUILD_TYPE=%build_type% ^
     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^
-    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64
+    -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch%
 pause
diff --git a/setup-release.sh b/setup-release.sh
index 949cabfc..63f52ef6 100755
--- a/setup-release.sh
+++ b/setup-release.sh
@@ -4,6 +4,7 @@
 build_dir=${1:-build-release}
 build_type=Release
 qt_version=6.8.0
+qt_arch=gcc_64
 script_dir="$(dirname "$(readlink -f "$0")")"
 
 mkdir -p ${build_dir}
@@ -11,5 +12,5 @@ cmake -B ${build_dir} -S . \
 	-DCMAKE_BUILD_TYPE=${build_type} \
 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \
 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \
-	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \
+	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \
 	-G Ninja