From 03c73f56d27ba5fdc6a8c8876667128888f98dac Mon Sep 17 00:00:00 2001 From: mittorn Date: Sun, 29 Sep 2019 01:39:40 +0700 Subject: [PATCH] waf: add linkflags before filtering cflags --- wscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 0839da65..fa0bb10b 100644 --- a/wscript +++ b/wscript @@ -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