lowmemory: merge

This commit is contained in:
Alibek Omarov
2019-11-05 01:15:31 +03:00
33 changed files with 1379 additions and 107 deletions

View File

@@ -14,6 +14,10 @@ def options(opt):
help = 'enable console input from stdin (always enabled for dedicated) [default: %default]')
grp.add_option('--fbdev', action = 'store_true', dest = 'FBDEV_SW', default = False,
help = 'build fbdev-only software-only engine')
grp.add_option('--disable-async-resolve', action = 'store_true', dest = 'NO_ASYNC_RESOLVE', default = False,
help = 'disable asynchronous name resolution')
grp.add_option('--enable-custom-swap', action = 'store_true', dest = 'CUSTOM_SWAP', default = False,
help = 'enable custom swap allocator. For devices with no swap support')
opt.load('sdl2')
@@ -28,7 +32,8 @@ def configure(conf):
conf.check_cc(lib = i)
elif conf.options.FBDEV_SW:
conf.define('XASH_FBDEV', 1)
conf.check_cc(lib = 'asound')
conf.check_cc( lib = 'asound' )
conf.check_cc( lib = 'rt' )
else:
conf.load('sdl2')
if not conf.env.HAVE_SDL2:
@@ -38,8 +43,15 @@ def configure(conf):
if conf.options.USE_SELECT == None:
conf.options.USE_SELECT = conf.options.DEDICATED
conf.define_cond('SINGLE_BINARY', conf.env.SINGLE_BINARY)
if not conf.env.DEST_OS in ['win32', 'android'] and not conf.options.NO_ASYNC_RESOLVE:
conf.check_cc( lib='pthread' )
if conf.options.CUSTOM_SWAP:
conf.define('XASH_CUSTOM_SWAP',1)
conf.env.CUSTOM_SWAP = True
conf.define_cond('SINGLE_BINARY', conf.env.SINGLE_BINARY)
conf.define_cond('XASH_NO_ASYNC_NS_RESOLVE', conf.options.NO_ASYNC_RESOLVE)
conf.define_cond('XASH_USE_SELECT', conf.options.USE_SELECT or conf.options.DEDICATED)
conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT)
conf.define_cond('XASH_64BIT', conf.env.DEST_SIZEOF_VOID_P != 4)
@@ -57,8 +69,9 @@ def build(bld):
# basic build: dedicated only, no dependencies
if bld.env.DEST_OS != 'win32':
libs += [ 'DL' , 'M' , 'RT', 'PTHREAD']
libs += [ 'DL' , 'M' , 'RT', 'PTHREAD', 'ASOUND']
source += bld.path.ant_glob(['platform/posix/*.c'])
else:
libs += ['USER32', 'SHELL32', 'GDI32', 'ADVAPI32', 'DBGHELP', 'PSAPI', 'WS2_32' ]
source += bld.path.ant_glob(['platform/win32/*.c'])
@@ -66,7 +79,8 @@ def build(bld):
if bld.env.DEST_OS == 'linux':
source += bld.path.ant_glob(['platform/linux/*.c'])
source += bld.path.ant_glob(['platform/stub/*.c'])
if bld.env.CUSTOM_SWAP:
source += bld.path.ant_glob(['platform/swap/*.c'])
if bld.env.HAVE_SDL2:
libs.append('SDL2')
@@ -83,12 +97,6 @@ def build(bld):
'client/vgui/*.c',
'client/avi/*.c'])
if bld.env.DEST_OS == 'linux' and not bld.env.HAVE_SDL2:
libs.append('RT')
if not bld.env.DEDICATED:
libs.append('ASOUND')
# HACK: public headers must be put before common, so we don't get wrong mathlib included
includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ]