|
|
@ -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([ |
|
|
|