vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

waf: add linkflags before filtering cflags

Browse source
This commit is contained in:
mittorn 2019-09-29 01:39:40 +07:00
parent 94d0c78913
commit 03c73f56d2
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wscript
View file

@ -191,6 +191,9 @@ def configure(conf):
'-Werror=parentheses',
]
conf.env.append_unique('LINKFLAGS', conf.get_flags_by_type(
linker_flags, conf.options.BUILD_TYPE, conf.env.COMPILER_CC))
cflags = conf.get_flags_by_type(compiler_c_cxx_flags, conf.options.BUILD_TYPE, conf.env.COMPILER_CC)
if conf.env.COMPILER_CC == 'msvc':
conf.env.append_unique('CFLAGS', cflags)
@ -202,8 +205,6 @@ def configure(conf):
conf.env.append_unique('CFLAGS', cflags + filter_cflags(conf, compiler_optional_flags, cflags, False))
conf.env.append_unique('CXXFLAGS', cflags + filter_cflags(conf, compiler_optional_flags, cflags, True))
conf.env.append_unique('LINKFLAGS', conf.get_flags_by_type(
linker_flags, conf.options.BUILD_TYPE, conf.env.COMPILER_CC))
conf.env.DEDICATED = conf.options.DEDICATED
# we don't need game launcher on dedicated