From 8723928e48ab6f5804b2e093ce7c124de9eab024 Mon Sep 17 00:00:00 2001
From: TheTank20 <pt18.relay@gmail.com>
Date: Wed, 4 Jun 2025 19:59:50 -0400
Subject: [PATCH] Update windows.yml

---
 .github/workflows/windows.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 834d14d..08388de 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -72,6 +72,7 @@ jobs:
         shell: msys2 {0}
         run: |
           export PATH="/c/TDM-GCC-64/bin:$PATH"
+          export OPENSSL_PREFIX="${GITHUB_WORKSPACE}/openssl-install-64"
           git clone --branch openssl-${OPENSSL_VERSION} https://github.com/openssl/openssl.git
           cd openssl
           ./Configure mingw64 no-shared --prefix="${OPENSSL_PREFIX}"
@@ -82,23 +83,25 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Configure UMSKT (TDM-GCC 64-bit)
-        shell: msys2 {0}
+        shell: pwsh
         run: |
-          export PATH="/c/TDM-GCC-64/bin:$PATH"
-          cmake -G "MinGW Makefiles" \
-            -DCMAKE_C_COMPILER="mingw-w64-x86_64-gcc" \
-            -DCMAKE_CXX_COMPILER="mingw-w64-x86_64-g++" \
-            -DOPENSSL_ROOT_DIR="${OPENSSL_PREFIX}" \
-            -DOPENSSL_INCLUDE_DIR="${OPENSSL_PREFIX}/include" \
-            -DOPENSSL_CRYPTO_LIBRARY="${OPENSSL_PREFIX}/lib/libcrypto.a" \
-            -DOPENSSL_SSL_LIBRARY="${OPENSSL_PREFIX}/lib/libssl.a" \
-            -DCMAKE_C_FLAGS="-m64" \
-            -DCMAKE_CXX_FLAGS="-m64" \
+          $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
+          cmake -G "MinGW Makefiles" `
+            -DCMAKE_C_COMPILER="gcc" `
+            -DCMAKE_CXX_COMPILER="g++" `
+            -DOPENSSL_ROOT_DIR="${env:GITHUB_WORKSPACE}/openssl-install-64" `
+            -DOPENSSL_INCLUDE_DIR="${env:GITHUB_WORKSPACE}/openssl-install-64/include" `
+            -DOPENSSL_CRYPTO_LIBRARY="${env:GITHUB_WORKSPACE}/openssl-install-64/lib/libcrypto.a" `
+            -DOPENSSL_SSL_LIBRARY="${env:GITHUB_WORKSPACE}/openssl-install-64/lib/libssl.a" `
+            -DCMAKE_C_FLAGS="-m64" `
+            -DCMAKE_CXX_FLAGS="-m64" `
             .
 
       - name: Build UMSKT (TDM-GCC 64-bit)
-        shell: msys2 {0}
-        run: make
+        shell: pwsh
+        run: |
+          $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
+          mingw32-make
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4.6.2