SDL3: update github workflow

icculus · Dec 22, 2024 · 8d92a4a · 8d92a4a
1 parent e72dc7d
commit 8d92a4a
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,22 +18,22 @@ jobs:
         - { name: MacOS,              os: macos-latest,   shell: sh }
         - { name: mingw-w64 (i686),   os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686 }
         - { name: mingw-w64 (x86_64), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64 }
-        - { name: MSVC (x86),         os: windows-latest, shell: pwsh,        flags: "-DCMAKE_TOOLCHAIN_FILE=C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake -A Win32", vcpkg: x86-windows }
-        - { name: MSVC (x64),         os: windows-latest, shell: pwsh,        flags: "-DCMAKE_TOOLCHAIN_FILE=C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake -A x64",   vcpkg: x64-windows }
-        - { name: MSVC (ARM64),       os: windows-latest, shell: pwsh,        flags: "-DCMAKE_TOOLCHAIN_FILE=C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake -A ARM64", vcpkg: arm64-windows }
+        - { name: MSVC (x86),         os: windows-latest, shell: pwsh, msvc: 1, arch: x86 }
+        - { name: MSVC (x64),         os: windows-latest, shell: pwsh, msvc: 1, arch: x64 }
+        - { name: MSVC (ARM64),       os: windows-latest, shell: pwsh, msvc: 1, arch: amd64_arm64 }
 
     steps:
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: ${{ matrix.platform.msvc }}
+      with:
+        arch: ${{ matrix.platform.arch }}
     - name: Setup Linux dependencies
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update
-        sudo apt-get install cmake ninja-build libsdl2-dev
-    - name: Setup MacOS dependencies
-      if: runner.os == 'MacOS'
-      run: |
-        brew install sdl2
-    - name: Set up MSYS2 dependencies
-      if: matrix.platform.shell == 'msys2 {0}'
+        sudo apt-get install cmake ninja-build
+    - name: Set up MSYS2
+      if: ${{ matrix.platform.shell == 'msys2 {0}' }}
       uses: msys2/setup-msys2@v2
       with:
         msystem: ${{ matrix.platform.msystem }}
@@ -42,11 +42,17 @@ jobs:
           ${{ matrix.platform.msys-env }}-cmake
           ${{ matrix.platform.msys-env }}-ninja
           ${{ matrix.platform.msys-env }}-SDL2
-    - name: Setup MSVC dependencies
-      if: matrix.platform.vcpkg != ''
-      run: |
-        vcpkg install --triplet ${{ matrix.platform.vcpkg }} sdl2
-
+    - name: Set up Ninja
+      uses: aseprite/get-ninja@main
+      if: ${{ !contains(matrix.platform.shell, 'msys2') }}
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        cmake-generator: Ninja
+        version: 3-head
+        sdl-test: false
+        shell: ${{ matrix.platform.shell }}
     - name: Get SDL_sound sources
       uses: actions/checkout@v3
     - name: Configure (CMake)