mirror of
https://github.com/FWGS/xash3d-fwgs.git
synced 2026-08-10 14:12:04 +08:00
engine: Remove XASH3D_MIRRORDIR
also make XASH3D_GAME for all platforms
This commit is contained in:
committed by
Alibek Omarov #SupportRMS
parent
a89f9fa181
commit
2b436dced0
@@ -1402,11 +1402,6 @@ void FS_Rescan( void )
|
||||
FS_AddPak_Fullpath( va( "%sextras.pak", SDL_GetBasePath() ), NULL, extrasFlags );
|
||||
FS_AddPak_Fullpath( va( "%sextras_%s.pak", SDL_GetBasePath(), GI->gamefolder ), NULL, extrasFlags );
|
||||
}
|
||||
#elif XASH_HAIKU
|
||||
if( ( dir = getenv( "XASH3D_MIRRORDIR" ) ) )
|
||||
FS_AddPak_Fullpath( va( "%s/extras.pak", dir ), NULL, extrasFlags );
|
||||
if( ( dir = getenv( "XASH3D_BASEDIR" ) ) )
|
||||
FS_AddPak_Fullpath( va( "%s/%s/extras.pak", dir , GI->gamefolder ), NULL, extrasFlags );
|
||||
#else
|
||||
str = getenv( "XASH3D_EXTRAS_PAK1" );
|
||||
if( COM_CheckString( str ) )
|
||||
|
||||
@@ -90,24 +90,6 @@ void *COM_LoadLibrary( const char *dllname, int build_ordinals_table, qboolean d
|
||||
return Platform_POSIX_LoadLibrary( dllname );
|
||||
#endif
|
||||
|
||||
#if XASH_HAIKU
|
||||
// First look for libraries in the mirror directory
|
||||
libdir = getenv( "XASH3D_MIRRORDIR" );
|
||||
if( libdir ) {
|
||||
char path[MAX_SYSPATH];
|
||||
char game[MAX_SYSPATH] = { 0 };
|
||||
if( GI && !Q_strstr( dllname, "menu" ) )
|
||||
Q_snprintf( game, MAX_SYSPATH, "/%s", GI->gamefolder );
|
||||
Q_snprintf( path, MAX_SYSPATH, "%s%s/%s", libdir, game, dllname );
|
||||
pHandle = dlopen( path, RTLD_NOW );
|
||||
if( pHandle )
|
||||
return pHandle;
|
||||
|
||||
COM_PushLibraryError( dlerror() );
|
||||
}
|
||||
// Then through FS_FindLibrary() function in the gamebase directory
|
||||
#endif
|
||||
|
||||
// platforms where gameinfo mechanism is working goes here
|
||||
// and use FS_FindLibrary
|
||||
hInst = FS_FindLibrary( dllname, directpath );
|
||||
|
||||
Reference in New Issue
Block a user