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

Revert "wscript: add zlib library"

Browse Source 
This reverts commit 9b68b0c1e2004095bd0eef3549bef036a020c990.
This commit is contained in:
Alibek Omarov 2019-06-02 11:22:18 +03:00
parent 73cf465ce4
commit ab16867f6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/wscript
View File

@ -52,9 +52,12 @@ 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' ]
@ -84,9 +87,6 @@ def build(bld):
libs += ['LOG', 'EGL', 'ANDROID'] libs += ['LOG', 'EGL', 'ANDROID']
source += bld.path.ant_glob(['platform/android/*.cpp', 'platform/android/*.c']) source += bld.path.ant_glob(['platform/android/*.cpp', 'platform/android/*.c'])
# Add zlib for all builds
libs += [ 'ZLIB' ]
# add client files # add client files
if not bld.env.DEDICATED: if not bld.env.DEDICATED:
source += bld.path.ant_glob([ source += bld.path.ant_glob([