vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wscript: enable main() function for Android port, which was forgotten after last refactoring

Browse source
This commit is contained in:
Alibek Omarov 2025-02-01 18:18:43 +03:00
parent 1b44d7733e
commit 5378494199
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
engine/wscript
View file

@ -194,7 +194,12 @@ def build(bld):
source += bld.path.ant_glob('client/**/*.c') source += bld.path.ant_glob('client/**/*.c')
libs += ['bzip2', 'MultiEmulator', 'opus', 'opusfile', 'vorbis', 'vorbisfile'] libs += ['bzip2', 'MultiEmulator', 'opus', 'opusfile', 'vorbis', 'vorbisfile']
if not bld.env.LAUNCHER and bld.env.DEST_OS != 'android': # Android port is linked differently
if bld.env.DEST_OS == 'android':
f = bld.shlib
install_path = bld.env.LIBDIR
defines += ['XASH_ENABLE_MAIN=1', 'XASH_SDLMAIN=1']
elif not bld.env.LAUNCHER:
f = bld.program f = bld.program
install_path = bld.env.BINDIR install_path = bld.env.BINDIR
defines += ['XASH_ENABLE_MAIN=1'] defines += ['XASH_ENABLE_MAIN=1']

2
wscript
View file

@ -239,14 +239,12 @@ def configure(conf):
conf.options.GL4ES = True conf.options.GL4ES = True
conf.options.GLES3COMPAT = True conf.options.GLES3COMPAT = True
conf.options.GL = False conf.options.GL = False
conf.define('XASH_SDLMAIN', 1)
elif conf.env.MAGX: elif conf.env.MAGX:
conf.options.SDL12 = True conf.options.SDL12 = True
conf.options.NO_VGUI = True conf.options.NO_VGUI = True
conf.options.GL = False conf.options.GL = False
conf.options.LOW_MEMORY = 1 conf.options.LOW_MEMORY = 1
conf.options.NO_ASYNC_RESOLVE = True conf.options.NO_ASYNC_RESOLVE = True
conf.define('XASH_SDLMAIN', 1)
enforce_pic = False enforce_pic = False
elif conf.env.DEST_OS == 'nswitch': elif conf.env.DEST_OS == 'nswitch':
conf.options.NO_VGUI = True conf.options.NO_VGUI = True