1.1 --- a/loader/loader.cpp Fri Oct 26 15:47:46 2012 -0400
1.2 +++ b/loader/loader.cpp Fri Oct 26 15:48:10 2012 -0400
1.3 @@ -90,9 +90,6 @@
1.4 #elif defined __APPLE__
1.5 #define LIBRARY_EXT ".dylib"
1.6 #define LIBRARY_MINEXT ".dylib"
1.7 -#elif defined __linux__
1.8 -#define LIBRARY_EXT LIB_SUFFIX
1.9 -#define LIBRARY_MINEXT ".so"
1.10 #endif
1.11
1.12 bool
1.13 @@ -205,9 +202,15 @@
1.14 char lib_path[PLATFORM_MAX_PATH];
1.15 const char *game_name;
1.16
1.17 - if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path)))
1.18 +#ifdef __linux__
1.19 + if (!mm_ResolvePath("bin/libtier0_srv.so", lib_path, sizeof(lib_path))
1.20 + && !mm_ResolvePath("bin/libtier0.so", lib_path, sizeof(lib_path))
1.21 + && !mm_ResolvePath("bin/tier0_i486.so", lib_path, sizeof(lib_path)))
1.22 +#else
1.23 + if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path)))
1.24 +#endif
1.25 {
1.26 - mm_LogFatal("Could not find path for: " TIER0_NAME);
1.27 + mm_LogFatal("Could not find path for tier0");
1.28 return NULL;
1.29 }
1.30
1.31 @@ -229,9 +232,15 @@
1.32 {
1.33 /* We probably have a Ship engine. */
1.34 mm_UnloadLibrary(lib);
1.35 +#ifdef __linux__
1.36 + if (!mm_ResolvePath("bin/libvstdlib_srv.so", lib_path, sizeof(lib_path))
1.37 + && !mm_ResolvePath("bin/libvstdlib.so", lib_path, sizeof(lib_path))
1.38 + && !mm_ResolvePath("bin/vstdlib_i486.so", lib_path, sizeof(lib_path)))
1.39 +#else
1.40 if (!mm_ResolvePath(VSTDLIB_NAME, lib_path, sizeof(lib_path)))
1.41 +#endif
1.42 {
1.43 - mm_LogFatal("Could not find path for: " VSTDLIB_NAME);
1.44 + mm_LogFatal("Could not find path for vstdlib");
1.45 return NULL;
1.46 }
1.47