diff options
Diffstat (limited to 'games/openarena/files/patch-feature-DEFAULT_LIBDIR')
| -rw-r--r-- | games/openarena/files/patch-feature-DEFAULT_LIBDIR | 71 |
1 files changed, 24 insertions, 47 deletions
diff --git a/games/openarena/files/patch-feature-DEFAULT_LIBDIR b/games/openarena/files/patch-feature-DEFAULT_LIBDIR index e7f0416b9b7c..0e977835024f 100644 --- a/games/openarena/files/patch-feature-DEFAULT_LIBDIR +++ b/games/openarena/files/patch-feature-DEFAULT_LIBDIR @@ -1,6 +1,6 @@ ---- code/qcommon/files.c.orig 2009-11-09 23:41:42.205886000 +0100 -+++ code/qcommon/files.c 2010-02-16 15:26:18.000000000 +0100 -@@ -242,6 +242,7 @@ +--- code/qcommon/files.c.orig 2011-03-10 02:01:27.599036000 +0100 ++++ code/qcommon/files.c 2011-03-19 22:40:42.000000000 +0100 +@@ -250,6 +250,7 @@ #endif static cvar_t *fs_basepath; @@ -8,18 +8,29 @@ static cvar_t *fs_basegame; static cvar_t *fs_gamedirvar; static searchpath_t *fs_searchpaths; -@@ -2807,6 +2808,8 @@ +@@ -2956,6 +2957,7 @@ fs_debug = Cvar_Get( "fs_debug", "0", 0 ); - fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT ); + fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED ); fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT ); + fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT ); -+ homePath = Sys_DefaultHomePath(); if (!homePath || !homePath[0]) { homePath = fs_basepath->string; ---- code/qcommon/qcommon.h.orig 2010-02-15 17:20:33.680787000 +0100 -+++ code/qcommon/qcommon.h 2010-02-16 15:26:18.000000000 +0100 -@@ -1085,6 +1085,9 @@ +@@ -2975,6 +2977,11 @@ + if (fs_apppath->string[0]) + FS_AddGameDirectory(fs_apppath->string, gameName); + #endif ++ ++ // Search default library location if given ++ if (fs_libpath->string[0]) { ++ FS_AddGameDirectory ( fs_libpath->string, gameName ); ++ } + + // NOTE: same filtering below for mods and basegame + if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) { +--- code/qcommon/qcommon.h.orig 2011-03-10 02:01:27.599036000 +0100 ++++ code/qcommon/qcommon.h 2011-03-19 22:40:42.000000000 +0100 +@@ -1104,6 +1104,9 @@ char *Sys_DefaultAppPath(void); #endif @@ -29,8 +40,8 @@ void Sys_SetDefaultHomePath(const char *path); char *Sys_DefaultHomePath(void); const char *Sys_TempPath(void); ---- code/sys/sys_main.c.orig 2010-02-15 17:20:33.680787000 +0100 -+++ code/sys/sys_main.c 2010-02-16 15:26:18.000000000 +0100 +--- code/sys/sys_main.c.orig 2011-02-23 17:17:09.009063000 +0100 ++++ code/sys/sys_main.c 2011-03-19 22:40:42.000000000 +0100 @@ -49,6 +49,7 @@ static char binaryPath[ MAX_OSPATH ] = { 0 }; @@ -69,41 +80,7 @@ Sys_DefaultAppPath ================= */ -@@ -435,6 +459,7 @@ - Used to load a development dll instead of a virtual machine - #1 look in fs_homepath - #2 look in fs_basepath -+#3 look in fs_libpath - ================= - */ - void *Sys_LoadDll( const char *name, char *fqpath , -@@ -445,6 +470,7 @@ - void (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) ); - char fname[MAX_OSPATH]; - char *basepath; -+ char *libpath; - char *homepath; - char *gamedir; - -@@ -454,6 +480,7 @@ - - // TODO: use fs_searchpaths from files.c - basepath = Cvar_VariableString( "fs_basepath" ); -+ libpath = Cvar_VariableString( "fs_libpath" ); - homepath = Cvar_VariableString( "fs_homepath" ); - gamedir = Cvar_VariableString( "fs_game" ); - -@@ -462,6 +489,9 @@ - if(!libHandle && basepath) - libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath); - -+ if(!libHandle && libpath) -+ libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath); -+ - if(!libHandle) { - Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name ); - return NULL; -@@ -515,6 +545,14 @@ +@@ -490,6 +514,14 @@ # endif #endif @@ -118,7 +95,7 @@ /* ================= Sys_SigHandler -@@ -589,6 +627,7 @@ +@@ -564,6 +596,7 @@ Sys_ParseArgs( argc, argv ); Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) ); Sys_SetDefaultInstallPath( DEFAULT_BASEDIR ); |