Run CI on more configurations

Author: eliemichel

.github/workflows/cmake.yml

@@ -12,26 +12,70 @@ env:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        system: [ Linux-x64, Windows-MSVC-x64, Windows-MSYS-x64, MacOS-x64, MacOS-ARM ]
+        webgpu-backend: [ DAWN, WGPU ]
+        link-type: [ SHARED, STATIC ]
+        build-type: [ Debug, Release ]
+
         include:
-        - os: ubuntu-latest
+        - system: Linux-x64
+          runner: ubuntu-latest
           install-deps: |
             sudo apt-get update -y
             sudo apt-get install -y xorg-dev
+
+        - system: Windows-MSVC-x64
+          runner: windows-latest
+          exe-extension: .exe
+          is-multiconfig: true
+
+        - system: Windows-MSYS-x64
+          runner: windows-latest
+          msystem: ucrt64
+          extra-cmake-args: -G "MSYS Makefiles"
+          exe-extension: .exe
+
+        - system: MacOS-ARM
+          runner: macos-latest
+
+        - system: MacOS-x64
+          runner: macos-13
+
+        exclude:
+        - webgpu-backend: DAWN
+          link-type: STATIC
 
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}
 
     steps:
     - uses: actions/checkout@v4
 
-    - if: ${{ matrix.install-deps }}
-      name: Install dependencies
+    - name: Install dependencies
+      if: ${{ matrix.install-deps }}
       run: ${{ matrix.install-deps }}
 
+    - name: Setup MSYS
+      if: ${{ matrix.msystem }}
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        pacboy: cmake:p
+
     - name: Configure CMake
-      run: cmake -S examples -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: >
+        cmake
+        -S examples
+        -B build
+        -DWEBGPU_BACKEND=${{ matrix.webgpu-backend }}
+        -D${{ matrix.webgpu-backend }}_LINK_TYPE=${{ matrix.link-type }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
+        ${{ matrix.extra-cmake-args }}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: >
+        cmake
+        --build build
+        --config ${{ matrix.build-type }}

examples/CMakeLists.txt

@@ -25,7 +25,20 @@ add_subdirectory(.. sdl2webgpu)
 
 # Example
 add_executable(hello-sdl2webgpu hello-sdl2webgpu.c)
-target_link_libraries(hello-sdl2webgpu PRIVATE SDL2::SDL2-static webgpu sdl2webgpu)
+target_link_libraries(hello-sdl2webgpu PRIVATE SDL2::SDL2 webgpu sdl2webgpu)
 set_target_properties(hello-sdl2webgpu PROPERTIES CXX_STANDARD 17)
 target_treat_all_warnings_as_errors(hello-sdl2webgpu)
+
+# Copy wgpu-native or Dawn dll/so/dylib next to the executable
 target_copy_webgpu_binaries(hello-sdl2webgpu)
+
+# Copy SDL2.dll/so/dylib next to the executable
+add_custom_command(
+  TARGET hello-sdl2webgpu
+  POST_BUILD
+  COMMAND
+    ${CMAKE_COMMAND}
+    -E copy_if_different
+    $<TARGET_FILE:SDL2::SDL2>
+    $<TARGET_FILE_DIR:hello-sdl2webgpu>
+)

examples/hello-sdl2webgpu.c

@@ -52,10 +52,11 @@ int main(int argc, char* argv[]) {
 
 	// Wait for close
 	SDL_Event event;
-	while (1)
+	int running = 1;
+	while (running)
 		while (SDL_PollEvent(&event))
 			if (event.type == SDL_QUIT)
-				break;
+				running = 0;
 	// Terminate SDL
 	SDL_DestroyWindow(window);
 	SDL_Quit();