rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Updated loader to attempt to guess correct tier0/vstdlib filenames on linux (bug 5522).

Browse Source
This commit is contained in:
Nicholas Hastings 2012-10-26 15:48:10 -04:00
parent 65a48029e5
commit 2819fe69e6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
loader/loader.cpp
View File

@ -90,9 +90,6 @@ static const char *backend_names[] =
#elif defined __APPLE__
#define LIBRARY_EXT ".dylib"
#define LIBRARY_MINEXT ".dylib"
#elif defined __linux__
#define LIBRARY_EXT LIB_SUFFIX
#define LIBRARY_MINEXT ".so"
#endif
bool
@ -205,9 +202,15 @@ mm_GetGameName()
char lib_path[PLATFORM_MAX_PATH];
const char *game_name;
if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path)))
#ifdef __linux__
if (!mm_ResolvePath("bin/libtier0_srv.so", lib_path, sizeof(lib_path))
&& !mm_ResolvePath("bin/libtier0.so", lib_path, sizeof(lib_path))
&& !mm_ResolvePath("bin/tier0_i486.so", lib_path, sizeof(lib_path)))
#else
if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path)))
#endif
{
mm_LogFatal("Could not find path for: " TIER0_NAME);
mm_LogFatal("Could not find path for tier0");
return NULL;
}
@ -229,9 +232,15 @@ mm_GetGameName()
{
/* We probably have a Ship engine. */
mm_UnloadLibrary(lib);
#ifdef __linux__
if (!mm_ResolvePath("bin/libvstdlib_srv.so", lib_path, sizeof(lib_path))
&& !mm_ResolvePath("bin/libvstdlib.so", lib_path, sizeof(lib_path))
&& !mm_ResolvePath("bin/vstdlib_i486.so", lib_path, sizeof(lib_path)))
#else
if (!mm_ResolvePath(VSTDLIB_NAME, lib_path, sizeof(lib_path)))
#endif
{
mm_LogFatal("Could not find path for: " VSTDLIB_NAME);
mm_LogFatal("Could not find path for vstdlib");
return NULL;
}