Windows

Mefiresu · Aug 13, 2024 · c577d5a · c577d5a
1 parent 3994796
commit c577d5a
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,26 +12,19 @@ on: workflow_dispatch
 
 jobs:
   v5-windows:
-    runs-on: windows-2022
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW32
-          update: true
-          install: pkg-config cmake make git mingw-w64-i686-gcc mingw-w64-i686-libogg mingw-w64-i686-libtheora
+      - name: Install dependencies
+        run: vcpkg install libtheora libogg --triplet=x86-windows-static
       - name: Build RSDKv5 + U
         run: |
-          cmake -B build_v5 -DRETRO_REVISION=2 -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Windows
+          cmake -B build_v5 -DRETRO_REVISION=2 -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x86-windows-static
           cmake --build build_v5 --parallel
-          cmake -B build_v5U -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Windows
+          cmake -B build_v5U -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x86-windows-static
           cmake --build build_v5U --parallel
       - name: Move artifacts
         run: |
@@ -43,26 +36,19 @@ jobs:
           name: v5-windows
           path: artifacts
   v5-windows-x64:
-    runs-on: windows-2022
-    defaults:
-      run:
-        shell: msys2 {0}
+    runs-on: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: pkg-config cmake make git mingw-w64-x86_64-gcc mingw-w64-x86_64-SDL2 mingw-w64-x86_64-libogg mingw-w64-x86_64-libtheora
+      - name: Install dependencies
+        run: vcpkg install libtheora libogg --triplet=x64-windows-static
       - name: Build RSDKv5 + U
         run: |
-          cmake -B build_v5 -DRETRO_REVISION=2 -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Windows
+          cmake -B build_v5 -DRETRO_REVISION=2 -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
           cmake --build build_v5 --parallel
-          cmake -B build_v5U -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Windows
+          cmake -B build_v5U -DRETRO_DISABLE_PLUS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
           cmake --build build_v5U --parallel
       - name: Move artifacts
         run: |