From 841d29088c74d734d240b1f9f8f64852ab588674 Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Sun, 14 Dec 2025 20:48:43 -0500
Subject: [PATCH 1/4] MSVC Build

There's probably a reason we were using GCC, time to see why
---
 .github/workflows/build_windows.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index ad85c32d..eccd7b37 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -55,15 +55,10 @@ jobs:
           version: ${{ env.QT_VERSION }}
           host: 'windows'
           target: 'desktop'
-          arch: 'win64_mingw'
+          arch: 'win64_msvc2022_64'
           cache: true
           cache-key-prefix: install-qt-${{ env.QT_VERSION }}-action
 
-      - name: Install GCC 11.2.0
-        uses: egor-tensin/setup-mingw@v2.2.0
-        with:
-          version: 11.2.0
-
       - name: Set Debug Flags
         if: inputs.build_type == 'Debug'
         run: echo "EXTRA_CMAKE_FLAGS=-DENABLE_DEBUG=True ${{ env.EXTRA_CMAKE_FLAGS }}" >> $env:GITHUB_ENV
@@ -76,7 +71,7 @@ jobs:
         working-directory: ${{ github.workspace }}
         env:
           SEED_KEY: ${{ secrets.SEED_KEY }}
-        run: cmake -G "MinGW Makefiles" -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"
+        run: cmake -B build -DGITHUB_WORKFLOW=True -DQT_GUI=True -DEMBED_DATA=True "${{ env.EXTRA_CMAKE_FLAGS }}"
         
       - name: Build
         working-directory: ${{ github.workspace }}
@@ -93,11 +88,8 @@ jobs:
         shell: cmd # Setting up environment vars only works properly in cmd?
         run: |
           mkdir wwhd_rando_windows
-          cp wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
-          cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libgcc_s_seh-1.dll wwhd_rando_windows\libgcc_s_seh-1.dll
-          cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libstdc++-6.dll wwhd_rando_windows\libstdc++-6.dll
-          cp ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\libwinpthread-1.dll wwhd_rando_windows\libwinpthread-1.dll
-          ${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\qtenv2.bat && cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw
+          cp ${{ inputs.build_type }}\wwhd_rando.exe wwhd_rando_windows\wwhd_rando.exe
+          cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw
 
       - name: Save Artifact
         uses: actions/upload-artifact@v6

From cfd3233bb311d1655b540d26b195c60b933aff11 Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Sun, 14 Dec 2025 20:52:00 -0500
Subject: [PATCH 2/4] Mac Qt Installation

- Cache Mac Qt install
- Let it use the default aqt version
---
 .github/workflows/build_mac.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index 86c5642a..1efedeab 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -43,11 +43,12 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          aqtversion: '==3.1.*'
           version: '${{ env.QT_VERSION }}'
           host: 'mac'
           target: 'desktop'
           arch: 'clang_64'
+          cache: true
+          cache-key-prefix: install-qt-${{ env.QT_VERSION }}-action
 
       - name: Set Debug Flags
         if: inputs.build_type == 'Debug'

From 16a44678e6e774a0dc32c247fbce6a693d450e9b Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Sun, 14 Dec 2025 20:59:45 -0500
Subject: [PATCH 3/4] Bump Qt Version

---
 .github/workflows/build_mac.yml     | 2 +-
 .github/workflows/build_windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index 1efedeab..00535e89 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -26,7 +26,7 @@ on:
         required: false
 
 env:
-  QT_VERSION: 6.8.1
+  QT_VERSION: 6.10.1
   EXTRA_CMAKE_FLAGS: ""
 
 jobs:
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index eccd7b37..a5bd75e5 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -26,7 +26,7 @@ on:
         required: false
 
 env:
-  QT_VERSION: 6.7.1
+  QT_VERSION: 6.10.1
   EXTRA_CMAKE_FLAGS: ""
 
 jobs:

From 4304faf3bf3ddc7fde673e1e09e696e53b7cd360 Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:02:19 -0500
Subject: [PATCH 4/4] Default Cache Prefix

The action already adds the version/other options to the cache key, so we don't need to specify the prefix manually
---
 .github/workflows/build_mac.yml     | 1 -
 .github/workflows/build_windows.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index 00535e89..42c0c846 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -48,7 +48,6 @@ jobs:
           target: 'desktop'
           arch: 'clang_64'
           cache: true
-          cache-key-prefix: install-qt-${{ env.QT_VERSION }}-action
 
       - name: Set Debug Flags
         if: inputs.build_type == 'Debug'
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index a5bd75e5..f32bcf53 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -57,7 +57,6 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2022_64'
           cache: true
-          cache-key-prefix: install-qt-${{ env.QT_VERSION }}-action
 
       - name: Set Debug Flags
         if: inputs.build_type == 'Debug'