diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 7917ebd..3c8d9ad 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -167,6 +167,8 @@ jobs: cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions" cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j $cpuCores + env: + SDL2_VERSION: ${{ inputs.SDL2_VERSION }} - name: Prepare Archive run: | Move-Item -Path "cmake-build/Zelda64Recompiled.exe" -Destination "Zelda64Recompiled.exe" diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f470e9..e72e64c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,11 +179,17 @@ endif() if (WIN32) include(FetchContent) + + if (DEFINED ENV{SDL2_VERSION}) + set(SDL2_VERSION $ENV{SDL2_VERSION}) + else() + set(SDL2_VERSION "2.28.5") + endif() + # Fetch SDL2 on windows FetchContent_Declare( sdl2 - URL https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip - URL_HASH MD5=d8173db078e54040c666f411c5a6afff + URL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-devel-${SDL2_VERSION}-VC.zip ) FetchContent_MakeAvailable(sdl2) target_include_directories(Zelda64Recompiled PRIVATE