Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

engine: Remove XASH3D_MIRRORDIR 

also make XASH3D_GAME for all platforms
This commit is contained in:
exstrim401 2021-06-07 17:48:09 +05:00 committed by Alibek Omarov #SupportRMS
parent a89f9fa181
commit 2b436dced0
3 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/common/filesystem.c
View File

@ -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 ) )

18
engine/platform/posix/lib_posix.c
View File

@ -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 );

56
game_launch/game.cpp
View File

@ -20,14 +20,8 @@ GNU General Public License for more details.
#include <stdlib.h>
#include <stdarg.h>
#if defined(__APPLE__) || defined(__unix__)
#if defined(__APPLE__) || defined(__unix__) || defined(__HAIKU__)
#define XASHLIB "libxash." OS_LIB_EXT
#elif __HAIKU__
#include <libgen.h>
#define XASHLIB "libxash." OS_LIB_EXT
#define E_GAME "XASH3D_GAME"
#define E_BASEDIR "XASH3D_BASEDIR"
#define E_MIRRORDIR "XASH3D_MIRRORDIR"
#elif _WIN32
#if !__MINGW32__ && _MSC_VER >= 1200
#define USE_WINMAIN
@ -37,6 +31,7 @@ GNU General Public License for more details.
#include <shellapi.h> // CommandLineToArgvW
#endif
#ifdef WIN32
extern "C"
{
@ -48,6 +43,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
}
#endif
#define E_GAME "XASH3D_GAME" // default env dir to start from
#define GAME_PATH "valve" // default dir to start from
typedef void (*pfnChangeGame)( const char *progname );
@ -93,15 +89,7 @@ static const char *GetStringLastError()
static void Sys_LoadEngine( void )
{
#ifdef __HAIKU__
char path[PATH_MAX];
char *engine = getenv( E_MIRRORDIR );
strncpy( path, engine, PATH_MAX );
strncat( path, "/"XASHLIB, PATH_MAX );
if(( hEngine = LoadLibrary( path )) == NULL )
#else
if(( hEngine = LoadLibrary( XASHLIB )) == NULL )
#endif
{
Xash_Error("Unable to load the " XASHLIB ": %s", dlerror() );
}
@ -152,12 +140,11 @@ _inline int Sys_Start( void )
changeGame = Sys_ChangeGame;
#endif
#ifdef __HAIKU__
const char* game = getenv( E_GAME );
char *game = getenv( E_GAME );
if( !game )
game = GAME_PATH;
ret = Xash_Main( szArgc, szArgv, game, 0, changeGame );
#else
ret = Xash_Main( szArgc, szArgv, GAME_PATH, 0, changeGame );
#endif
Sys_UnloadEngine();
@ -170,35 +157,6 @@ int main( int argc, char **argv )
szArgc = argc;
szArgv = argv;
#ifdef __HAIKU__
// To make it able to start from Deskbar
chdir( dirname( argv[0] ) );
char path[PATH_MAX];
getcwd( path, PATH_MAX );
const char *game = getenv( E_GAME );
if( !game )
setenv( E_GAME, GAME_PATH, 1 );
const char *basedir = getenv( E_BASEDIR );
if( !basedir )
setenv( E_BASEDIR, path, 1 );
const char *mirrordir = getenv( E_MIRRORDIR );
// The mirror "extras/" directory structure for Haiku OS which is needeed for the HPGK-package:
// extras.pak
// libmenu.so
// libxash.so
// valve/
// cl_dlls/
// client_haiku_amd64.so
// dlls/
// hl_haiku_amd64.so
if( !mirrordir )
{
strncpy( path, getenv( E_BASEDIR ), PATH_MAX );
strncat( path, "/extras", PATH_MAX );
setenv( E_MIRRORDIR, path, 1 );
}
#endif
return Sys_Start();
}
#else