source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-06 18:08:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Linux build not compiling.

Browse Source
This commit is contained in:
tschumann 2025-04-12 17:50:28 +10:00 committed by Nicholas Hastings
parent 99672c2f3f
commit 280ca9d826
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader/test/determinebackends1.cpp
View File

@ -11,7 +11,7 @@
#define ENGINE_LIB_NAME "engine" LIB_SUFFIX #define ENGINE_LIB_NAME "engine" LIB_SUFFIX
#endif #endif
bool DetermineBackendS1(char *gameDir, int expectedBackend) bool DetermineBackendS1(const char *gameDir, int expectedBackend)
{ {
char errorBuffer[128]; char errorBuffer[128];
void *serverLib = nullptr; void *serverLib = nullptr;

7
loader/test/main.cpp
View File

@ -20,13 +20,13 @@
} \ } \
bool DetermineBackendS1(char *gameDir, int expectedBackend); bool DetermineBackendS1(const char *gameDir, int expectedBackend);
DECL_TEST(TrimComments); DECL_TEST(TrimComments);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
bool testDetermineBackendS1 = false; bool testDetermineBackendS1 = false;
char *gameDirectory = ""; char *gameDirectory = NULL;
int expectedMetamodBackend = -1; int expectedMetamodBackend = -1;
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
@ -47,8 +47,7 @@ int main(int argc, char *argv[])
if (testDetermineBackendS1) if (testDetermineBackendS1)
{ {
bool success = DetermineBackendS1(gameDirectory, expectedMetamodBackend); bool success = DetermineBackendS1(gameDirectory ? gameDirectory : "", expectedMetamodBackend);
// invert it because return code from main has 0 as success // invert it because return code from main has 0 as success
return success != true; return success != true;
} }

1
loader/test/test_determinebackends1.ps1
View File

@ -95,6 +95,7 @@ function testGame([SteamGame]$game)
Return Return
} }
# make gamedir the last parameter as something weird is going on where if it's "" then PowerShell is collapsing it and the next argument gets passed as gamedir
if ($game.Architecture -eq "x86") if ($game.Architecture -eq "x86")
{ {
$env:Path=$enginePath + ";" + $gamePath + ";" + $env:Path; ..\..\build\loader\test\test_loader\windows-x86\test_loader.exe -testdbs1 -expectedbackend $game.ExpectedBackend -gamedir $game.GameDir $env:Path=$enginePath + ";" + $gamePath + ";" + $env:Path; ..\..\build\loader\test\test_loader\windows-x86\test_loader.exe -testdbs1 -expectedbackend $game.ExpectedBackend -gamedir $game.GameDir