diff --git a/game_launch/game.cpp b/game_launch/game.cpp index 65e95840..0c7dc657 100644 --- a/game_launch/game.cpp +++ b/game_launch/game.cpp @@ -183,11 +183,7 @@ static int Sys_Start( void ) snprintf( buf, sizeof( buf ), "%s/xash", home ); setenv( "XASH3D_BASEDIR", buf, true ); -#if XASH_AURORAOS - setenv( "XASH3D_RODIR", "/usr/share/su.xash.Engine/rodir", true ); -#else setenv( "XASH3D_RODIR", "/usr/share/harbour-xash3d-fwgs/rodir", true ); -#endif // XASH_AURORAOS #endif // XASH_SAILFISH strncpy( szGameDir, XASH_GAMEDIR, sizeof( szGameDir ) - 1 ); diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py index b435f498..e473761e 100644 --- a/scripts/waifulib/xcompile.py +++ b/scripts/waifulib/xcompile.py @@ -604,8 +604,8 @@ def options(opt): help='enable building for Nintendo Switch [default: %(default)s]') xc.add_option('--psvita', action='store_true', dest='PSVITA', default = False, help='enable building for PlayStation Vita [default: %(default)s]') - xc.add_option('--sailfish', action='store', dest='SAILFISH', default = None, - help='enable building for Sailfish/Aurora') + xc.add_option('--sailfish', action='store_true', dest='SAILFISH', default = False, + help='enable building for Sailfish') xc.add_option('--emscripten', action='store_true', dest='EMSCRIPTEN', default = None, help='enable building for Emscripten') xc.add_option('--psp', action='store', dest='PSP_OPTS', default=None, diff --git a/wscript b/wscript index c1934ffe..6ad4b4fd 100644 --- a/wscript +++ b/wscript @@ -298,15 +298,8 @@ def configure(conf): # check if we're in a sgug environment if 'sgug' in os.environ['LD_LIBRARYN32_PATH']: linkflags.append('-lc') - elif conf.env.SAILFISH in ['aurora', 'sailfish']: - # TODO: enable XASH_MOBILE_PLATFORM + elif conf.env.SAILFISH: conf.define('XASH_SAILFISH', 1) - if conf.env.SAILFISH == 'aurora': - conf.define('XASH_AURORAOS', 1) - - # Do not warn us about bug in SDL_Audio headers - conf.env.append_unique('CFLAGS', ['-Wno-attributes']) - conf.env.append_unique('CXXFLAGS', ['-Wno-attributes']) conf.check_cc(cflags=cflags, linkflags=linkflags, msg='Checking for required C flags') conf.check_cxx(cxxflags=cxxflags, linkflags=linkflags, msg='Checking for required C++ flags') @@ -416,9 +409,7 @@ def configure(conf): conf.define_cond('SUPPORT_HL25_EXTENDED_STRUCTS', conf.options.SUPPORT_HL25_EXTENDED_STRUCTS) - if conf.env.SAILFISH == 'aurora': - conf.env.DEFAULT_RPATH = '/usr/share/su.xash.Engine/lib' - elif conf.env.DEST_OS == 'darwin': + if conf.env.DEST_OS == 'darwin': conf.env.DEFAULT_RPATH = '@loader_path' elif conf.env.DEST_OS == 'openbsd': # OpenBSD requires -z origin to enable $ORIGIN expansion in RPATH @@ -494,9 +485,7 @@ def configure(conf): # indicate if we are packaging for Linux/BSD if conf.options.PACKAGING: conf.env.PREFIX = conf.options.prefix - if conf.env.SAILFISH == "aurora": - conf.env.SHAREDIR = '${PREFIX}/share/su.xash.Engine/rodir' - elif conf.env.SAILFISH == "sailfish": + if conf.env.SAILFISH: conf.env.SHAREDIR = '${PREFIX}/share/harbour-xash3d-fwgs/rodir' else: conf.env.SHAREDIR = '${PREFIX}/share/xash3d'