mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-12-24 01:35:24 +01:00
parent
73cf465ce4
commit
ab16867f6b
@ -52,9 +52,12 @@ def configure(conf):
|
||||
if conf.env.DEST_OS == 'win32':
|
||||
conf.env.append_unique('DEFINES', 'DBGHELP')
|
||||
conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1')
|
||||
<<<<<<< HEAD
|
||||
|
||||
if conf.env.DEST_SIZEOF_VOID_P != 4:
|
||||
conf.env.append_unique('DEFINES', 'XASH_64BIT')
|
||||
=======
|
||||
>>>>>>> parent of 9b68b0c... wscript: add zlib library
|
||||
|
||||
def build(bld):
|
||||
libs = [ 'public' ]
|
||||
@ -84,9 +87,6 @@ def build(bld):
|
||||
libs += ['LOG', 'EGL', 'ANDROID']
|
||||
source += bld.path.ant_glob(['platform/android/*.cpp', 'platform/android/*.c'])
|
||||
|
||||
# Add zlib for all builds
|
||||
libs += [ 'ZLIB' ]
|
||||
|
||||
# add client files
|
||||
if not bld.env.DEDICATED:
|
||||
source += bld.path.ant_glob([
|
||||
|
Loading…
Reference in New Issue
Block a user