Merge branch 'master' into master

This commit is contained in:
Mr0maks
2019-05-30 21:25:56 +05:00
committed by GitHub
19 changed files with 232 additions and 131 deletions

View File

@@ -34,6 +34,9 @@ def configure(conf):
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')
conf.check_cc(header_name='zlib.h', uselib_store='ZLIB')
conf.check_cc(lib='z', uselib_store='ZLIB')
if conf.env.SINGLE_BINARY:
conf.env.append_unique('DEFINES', 'SINGLE_BINARY')
@@ -49,9 +52,9 @@ def configure(conf):
if conf.env.DEST_OS == 'win32':
conf.env.append_unique('DEFINES', 'DBGHELP')
conf.env.append_unique('DEFINES', 'PSAPI_VERSION=1')
conf.check_cc(header_name='zlib.h', uselib_store='ZLIB')
conf.check_cc(lib='z', uselib_store='ZLIB')
if conf.env.DEST_SIZEOF_VOID_P != 4:
conf.env.append_unique('DEFINES', 'XASH_64BIT')
def build(bld):
libs = [ 'public' ]