YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

engine: wscript: fix broken wscript after revert, oops

Browse Source
This commit is contained in:
Alibek Omarov 2019-06-02 12:26:58 +03:00
parent ab16867f6b
commit 9119635ed3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/wscript
View File

@ -35,9 +35,6 @@ def configure(conf):
conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated') conf.fatal('SDL2 not availiable! If you want to build dedicated server, specify --dedicated')
conf.env.append_unique('DEFINES', 'XASH_SDL') conf.env.append_unique('DEFINES', 'XASH_SDL')
conf.check_cc(header_name='zlib.h', uselib_store='ZLIB')
conf.check_cc(lib='z', uselib_store='ZLIB')
if conf.env.SINGLE_BINARY: if conf.env.SINGLE_BINARY:
conf.env.append_unique('DEFINES', 'SINGLE_BINARY') conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
@ -52,12 +49,9 @@ def configure(conf):
if conf.env.DEST_OS == 'win32': if conf.env.DEST_OS == 'win32':
conf.env.append_unique('DEFINES', 'DBGHELP') conf.env.append_unique('DEFINES', 'DBGHELP')
conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1') conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1')
<<<<<<< HEAD
if conf.env.DEST_SIZEOF_VOID_P != 4: if conf.env.DEST_SIZEOF_VOID_P != 4:
conf.env.append_unique('DEFINES', 'XASH_64BIT') conf.env.append_unique('DEFINES', 'XASH_64BIT')
=======
>>>>>>> parent of 9b68b0c... wscript: add zlib library
def build(bld): def build(bld):
libs = [ 'public' ] libs = [ 'public' ]