Skip to content

Commit

Permalink
ci: Use Ninja generator for SDL as MSVC one has issues with ci runners
Browse files Browse the repository at this point in the history
  • Loading branch information
dimhotepus committed Dec 28, 2024
1 parent 4343461 commit a844fe6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .slnitems
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.clang-format
.editorconfig
.gitignore
.github\workflows\build.yml
.slnitems
LICENSE
README.md
CMakeLists.txt
8 changes: 5 additions & 3 deletions create_game_projects.bat
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,10 @@ if ERRORLEVEL 1 (

REM Build SDL.
MKDIR thirdparty\SDL\out
PUSHD thirdparty\SDL\out
cmake -G %CMAKE_MSVC_GEN_NAME% -A %CMAKE_MSVC_ARCH_NAME% -DSDL_TEST=OFF ..
PUSHD thirdparty\SDL\out
REM Use Ninja generator to overcome Github CI issues
REM https://github.com/actions/runner-images/issues/10980
cmake -G Ninja -DSDL_TEST=OFF ..
if ERRORLEVEL 1 (
ECHO cmake generation for thirdparty\SDL failed.
EXIT /B 1
Expand Down Expand Up @@ -258,7 +260,7 @@ if ["%CMAKE_MSVC_ARCH_NAME%"]==["x64"] (


REM Finally create solution.
devtools\bin\vpc.exe /2022 %WIN_X64% /define:WORKSHOP_IMPORT_DISABLE /define:SIXENSE_DISABLE /define:NO_X360_XDK /define:RAD_TELEMETRY_DISABLED /define:DISABLE_ETW /define:NO_STEAM /define:NO_ATI_COMPRESS /define:NO_NVTC /define:LTCG /no_ceg /nofpo /%GAME_NAME% +game /mksln %SOLUTION_NAME%.sln
devtools\bin\vpc.exe /2022 %WIN_X64% /define:WORKSHOP_IMPORT_DISABLE /define:SIXENSE_DISABLE /define:NO_X360_XDK /define:RAD_TELEMETRY_DISABLED /define:DISABLE_ETW /define:NO_STEAM /define:NO_ATI_COMPRESS /define:NO_NVTC /define:LTCG /define:ASAN /no_ceg /nofpo /%GAME_NAME% +game /mksln %SOLUTION_NAME%.sln /slnitems .slnitems
if ERRORLEVEL 1 (
ECHO MSBuild for %SOLUTION_NAME%.sln failed.
EXIT /B 1
Expand Down

0 comments on commit a844fe6

Please sign in to comment.