Skip to content

Commit 9544370

Browse files
committed
ci: Use Ninja generator for SDL as MSVC one has issues with ci runners
See actions/runner-images#10980 libsdl-org/SDL#11487
1 parent 4343461 commit 9544370

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

.slnitems

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.clang-format
2+
.editorconfig
3+
.gitignore
4+
.github\workflows\build.yml
5+
.slnitems
6+
LICENSE
7+
README.md
8+
CMakeLists.txt

create_game_projects.bat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,10 @@ if ERRORLEVEL 1 (
179179

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

259261

260262
REM Finally create solution.
261-
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
263+
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 /slnitems .slnitems
262264
if ERRORLEVEL 1 (
263265
ECHO MSBuild for %SOLUTION_NAME%.sln failed.
264266
EXIT /B 1

inputsystem/inputsystem.vpc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$Macro SRCDIR ".."
88
$Macro OUTBINDIR "$SRCDIR\..\game\bin"
99
$Macro SDL3SRCDIR "$SRCDIR\thirdparty\SDL"
10-
$Macro SDL3OUTDIR "$SDL3SRCDIR\out\Release"
10+
$Macro SDL3OUTDIR "$SDL3SRCDIR\out"
1111

1212
$include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
1313

launcher/launcher.vpc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
$Macro SRCDIR ".."
88
$Macro OUTBINDIR "$SRCDIR\..\game\bin"
99
$Macro SDL3SRCDIR "$SRCDIR\thirdparty\SDL"
10-
$Macro SDL3OUTDIR "$SDL3SRCDIR\out\Release"
10+
$Macro SDL3OUTDIR "$SDL3SRCDIR\out"
1111

1212
$Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
1313

0 commit comments

Comments
 (0)