diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-09-16 09:30:21 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-09-16 09:30:21 +0000 |
| commit | a7ef60763b39a909910522cc7dc420c21887ec94 (patch) | |
| tree | 54feccda4cf04ebb39ba23cef2f52fc930a90d2b /code/sys | |
| parent | 8d6644fb7622e7fb2a4702191d330131c9991816 (diff) | |
| download | ioquake3-aero-a7ef60763b39a909910522cc7dc420c21887ec94.tar.gz ioquake3-aero-a7ef60763b39a909910522cc7dc420c21887ec94.zip | |
* ...and actually r1626 this time
git-svn-id: svn://svn.icculus.org/quake3/trunk@1630 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/sys')
| -rw-r--r-- | code/sys/sys_main.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c index 56819d1..ff58187 100644 --- a/code/sys/sys_main.c +++ b/code/sys/sys_main.c @@ -49,7 +49,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA static char binaryPath[ MAX_OSPATH ] = { 0 }; static char installPath[ MAX_OSPATH ] = { 0 }; -static char libPath[ MAX_OSPATH ] = { 0 }; /* ================= @@ -96,29 +95,6 @@ char *Sys_DefaultInstallPath(void) /* ================= -Sys_SetDefaultLibPath -================= -*/ -void Sys_SetDefaultLibPath(const char *path) -{ - Q_strncpyz(libPath, path, sizeof(libPath)); -} - -/* -================= -Sys_DefaultLibPath -================= -*/ -char *Sys_DefaultLibPath(void) -{ - if (*libPath) - return libPath; - else - return Sys_Cwd(); -} - -/* -================= Sys_DefaultAppPath ================= */ @@ -408,7 +384,6 @@ Used to load a development dll instead of a virtual machine #1 look down current path #2 look in fs_homepath #3 look in fs_basepath -#4 look in fs_libpath ================= */ void *Sys_LoadDll( const char *name, char *fqpath , @@ -419,7 +394,6 @@ void *Sys_LoadDll( const char *name, char *fqpath , void (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) ); char fname[MAX_OSPATH]; char *basepath; - char *libpath; char *homepath; char *pwdpath; char *gamedir; @@ -431,7 +405,6 @@ void *Sys_LoadDll( const char *name, char *fqpath , // TODO: use fs_searchpaths from files.c pwdpath = Sys_Cwd(); basepath = Cvar_VariableString( "fs_basepath" ); - libpath = Cvar_VariableString( "fs_libpath" ); homepath = Cvar_VariableString( "fs_homepath" ); gamedir = Cvar_VariableString( "fs_game" ); @@ -443,9 +416,6 @@ void *Sys_LoadDll( const char *name, char *fqpath , 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; @@ -499,14 +469,6 @@ void Sys_ParseArgs( int argc, char **argv ) # endif #endif -#ifndef DEFAULT_LIBDIR -# ifdef MACOS_X -# define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath()) -# else -# define DEFAULT_LIBDIR Sys_BinaryPath() -# endif -#endif - /* ================= Sys_SigHandler @@ -576,7 +538,6 @@ int main( int argc, char **argv ) Sys_ParseArgs( argc, argv ); Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) ); Sys_SetDefaultInstallPath( DEFAULT_BASEDIR ); - Sys_SetDefaultLibPath( DEFAULT_LIBDIR ); // Concatenate the command line for passing to Com_Init for( i = 1; i < argc; i++ ) |