waifulib: update

This commit is contained in:
nillerusr
2021-04-28 08:36:34 +03:00
parent b33af199a7
commit 814b22f25b
16 changed files with 1794 additions and 283 deletions
+5 -3
View File
@@ -154,6 +154,8 @@ def define_platform(conf):
if conf.options.SDL:
conf.define('USE_SDL', 1)
print(conf.env.DEST_OS)
if conf.env.DEST_OS == 'linux':
conf.define('_GLIBCXX_USE_CXX11_ABI',0)
conf.env.append_unique('DEFINES', [
@@ -167,7 +169,7 @@ def define_platform(conf):
if conf.env.DEST_OS == 'android':
conf.env.append_unique('DEFINES', [
'ANDROID', '_ANDROID'
'ANDROID=1', '_ANDROID=1'
'LINUX=1', '_LINUX=1',
'POSIX=1', '_POSIX=1',
'GNUC',
@@ -213,6 +215,8 @@ def configure(conf):
conf.load('msvc msvc_pdb msdev msvs')
conf.load('subproject xcompile compiler_c compiler_cxx gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic')
define_platform(conf)
if conf.options.SDL:
conf.check_cfg(package='sdl2', uselib_store='SDL2', args=['--cflags', '--libs'])
if conf.options.DEDICATED:
@@ -335,8 +339,6 @@ def configure(conf):
else:
conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX
define_platform(conf)
if conf.options.DEDICATED:
conf.add_subproject(projects['dedicated'])
else: