id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 22:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle macOS / linux differences for build path option within Sys_DefaultBasePath()

Browse source
This commit is contained in:
Stephen Saunders 2022-12-14 01:30:48 -05:00
parent 7f37eccf61
commit cd2bb986c2
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
neo/sys/posix/posix_main.cpp
View file

@ -412,8 +412,8 @@ Sys_DefaultBasePath
Get the default base path
- binary image path
- current directory
- build directory path // SRS - added build directory path
- macOS app bundle resources directory path // SRS - added macOS app bundle resources path
- build directory path // SRS - added build directory path
- hardcoded
Try to be intelligent: if there is no BASE_GAMEDIR, try the next path
================
@ -456,19 +456,6 @@ const char* Sys_DefaultBasePath()
}
if( exepath.Length() )
{
// SRS - Check for linux/macOS build path (standard IDE structure with build dir and config suffixes)
basepath = exepath + "/../..";
testbase = basepath;
testbase += "/";
testbase += BASE_GAMEDIR;
if( stat( testbase.c_str(), &st ) != -1 && S_ISDIR( st.st_mode ) )
{
return basepath.c_str();
}
else
{
common->Printf( "no '%s' directory in build path %s, skipping\n", BASE_GAMEDIR, basepath.c_str() );
}
#if defined(__APPLE__)
// SRS - Check for macOS app bundle resources path
basepath = exepath + "/../Resources";
@ -483,7 +470,22 @@ const char* Sys_DefaultBasePath()
{
common->Printf( "no '%s' directory in macOS app bundle resources path %s, skipping\n", BASE_GAMEDIR, basepath.c_str() );
}
// SRS - Check for macOS/linux build path (directory structure with build dir and possible config suffix)
basepath = exepath + "/../.."; // for macOS Xcode builds with Debug/Release/etc config suffix
#else
basepath = exepath + "/.."; // for linux IDE and command line builds
#endif
testbase = basepath;
testbase += "/";
testbase += BASE_GAMEDIR;
if( stat( testbase.c_str(), &st ) != -1 && S_ISDIR( st.st_mode ) )
{
return basepath.c_str();
}
else
{
common->Printf( "no '%s' directory in build path %s, skipping\n", BASE_GAMEDIR, basepath.c_str() );
}
}
common->Printf( "WARNING: using hardcoded default base path %s\n", DEFAULT_BASEPATH );
return DEFAULT_BASEPATH;