update waf, enable gccdeps and msvcdeps

This commit is contained in:
nillerusr 2023-11-24 11:28:25 +03:00
parent 23204fcc73
commit 90e2937b32
2 changed files with 10 additions and 10 deletions

14
waf vendored

File diff suppressed because one or more lines are too long

View File

@ -51,7 +51,7 @@ projects={
'datacache', 'datacache',
'datamodel', 'datamodel',
'dmxloader', 'dmxloader',
'engine', # 'engine',
'engine/voice_codecs/minimp3', 'engine/voice_codecs/minimp3',
'filesystem', 'filesystem',
'game/client', 'game/client',
@ -433,7 +433,7 @@ def check_deps(conf):
# conf.multicheck(*a, run_all_tests = True, mandatory = True) # conf.multicheck(*a, run_all_tests = True, mandatory = True)
def configure(conf): def configure(conf):
conf.load('fwgslib reconfigure compiler_optimizations') conf.load('fwgslib reconfigure compiler_c compiler_cxx compiler_optimizations gccdeps msvcdeps')
# Force XP compability, all build targets should add # Force XP compability, all build targets should add
# subsystem=bld.env.MSVC_SUBSYSTEM # subsystem=bld.env.MSVC_SUBSYSTEM
@ -495,7 +495,7 @@ def configure(conf):
cflags, linkflags = conf.get_optimization_flags() cflags, linkflags = conf.get_optimization_flags()
flags = [] flags = [] #'-M -MT']
if conf.options.SANITIZE: if conf.options.SANITIZE:
flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr'] flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr']