RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-10 14:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

wscript: use ConfigurationContext.define instead of appending to env['DEFINES']

Browse Source
This commit is contained in:
Alibek Omarov
2019-10-11 03:42:20 +03:00
parent a5fa4df37c
commit 8889bda261
6 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/wscript
+8 -17
View File
@@ -22,7 +22,7 @@ def configure(conf):
if conf.options.DEDICATED:
if conf.env.DEST_OS == 'linux':
conf.check_cc( lib='rt' )
conf.env.append_unique('DEFINES', 'XASH_DEDICATED=1')
conf.define('XASH_DEDICATED', 1)
elif conf.env.DEST_OS == 'android': # Android doesn't need SDL2
for i in ['android', 'log', 'EGL']:
conf.check_cc(lib = i)
@@ -30,26 +30,17 @@ def configure(conf):
conf.load('sdl2')
if not conf.env.HAVE_SDL2:
conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
conf.env.append_unique('DEFINES', 'XASH_SDL')
if conf.env.SINGLE_BINARY:
conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
conf.define('XASH_SDL', 1)
if conf.options.USE_SELECT == None:
conf.options.USE_SELECT = conf.options.DEDICATED
if conf.options.USE_SELECT:
conf.env.append_unique('DEFINES', 'XASH_USE_SELECT')
if conf.options.SUPPORT_BSP2_FORMAT:
conf.env.append_unique('DEFINES', 'SUPPORT_BSP2_FORMAT')
if conf.env.DEST_OS == 'win32':
conf.env.append_unique('DEFINES', 'DBGHELP')
conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1')
if conf.env.DEST_SIZEOF_VOID_P != 4:
conf.env.append_unique('DEFINES', 'XASH_64BIT')
conf.define_cond('SINGLE_BINARY', conf.env.SINGLE_BINARY)
conf.define_cond('XASH_USE_SELECT', conf.options.USE_SELECT)
conf.define_cond('SUPPORT_BSP2_FORMAT', conf.options.SUPPORT_BSP2_FORMAT)
conf.define_cond('XASH_64BIT', conf.env.DEST_SIZEOF_VOID_P != 4)
conf.define_cond('DBGHELP', conf.env.DEST_OS == 'win32')
conf.define_cond('PSAPI_VERSION', conf.env.DEST_OS == 'win32') # will be defined as 1
def build(bld):
libs = [ 'public' ]