62 lines
1.6 KiB
Diff
62 lines
1.6 KiB
Diff
|
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
|
||
|
|
index 51f708d0..c4d971f7 100644
|
||
|
|
--- a/src/sdl/i_system.c
|
||
|
|
+++ b/src/sdl/i_system.c
|
||
|
|
@@ -139,7 +139,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
||
|
|
|
||
|
|
// Locations for searching the srb2.srb
|
||
|
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||
|
|
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
|
||
|
|
+#define DEFAULTWADLOCATION1 "@wadlocation@"
|
||
|
|
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
|
||
|
|
#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
|
||
|
|
#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
|
||
|
|
@@ -3646,47 +3646,6 @@ static const char *locateWad(void)
|
||
|
|
if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
|
||
|
|
return envstr;
|
||
|
|
|
||
|
|
-#ifndef NOCWD
|
||
|
|
- I_OutputMsg(",.");
|
||
|
|
- // examine current dir
|
||
|
|
- strcpy(returnWadPath, ".");
|
||
|
|
- if (isWadPathOk(returnWadPath))
|
||
|
|
- return NULL;
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-#ifdef DEFAULTDIR
|
||
|
|
- I_OutputMsg(",HOME/" DEFAULTDIR);
|
||
|
|
- // examine user jart directory
|
||
|
|
- if ((envstr = I_GetEnv("HOME")) != NULL)
|
||
|
|
- {
|
||
|
|
- sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
||
|
|
- if (isWadPathOk(returnWadPath))
|
||
|
|
- return returnWadPath;
|
||
|
|
- }
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-#ifdef CMAKECONFIG
|
||
|
|
-#ifndef NDEBUG
|
||
|
|
- I_OutputMsg(","CMAKE_ASSETS_DIR);
|
||
|
|
- strcpy(returnWadPath, CMAKE_ASSETS_DIR);
|
||
|
|
- if (isWadPathOk(returnWadPath))
|
||
|
|
- {
|
||
|
|
- return returnWadPath;
|
||
|
|
- }
|
||
|
|
-#endif
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
-#ifdef __APPLE__
|
||
|
|
- OSX_GetResourcesPath(returnWadPath);
|
||
|
|
- I_OutputMsg(",%s", returnWadPath);
|
||
|
|
- if (isWadPathOk(returnWadPath))
|
||
|
|
- {
|
||
|
|
- return returnWadPath;
|
||
|
|
- }
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
// examine default dirs
|
||
|
|
#ifdef DEFAULTWADLOCATION1
|
||
|
|
I_OutputMsg(","DEFAULTWADLOCATION1);
|