From 3d0bdbd6da48ea2000aff937b34baec57f98bb2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 18 Jan 2015 16:23:00 +0100 Subject: [PATCH] waf: The GEANY_*_SYMBOL flags also need to be defined for C++ In Waf, we need to add the new flags to CFLAGS *and* CXXFLAGS otherwise the Scintilla build would break. To keep it more reabable, we first populate a temporary list geany_symbol_flags which is then added to CFLAGS and CXXFLAGS. Concerning the quote FIXME: no further qoting is necessary here. --- wscript | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wscript b/wscript index da4ae904f..49bdd8912 100644 --- a/wscript +++ b/wscript @@ -308,17 +308,18 @@ but you then may not have a local copy of the HTML manual.''' conf.write_config_header('config.h', remove=False) # GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL - # FIXME: should I put quoting in the appended values or are they passed as-is? if is_win32: - conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)']) + geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)'] # FIXME: check for -fvisibility and the __attribute__((visibility)), or # at least for GCC >= 4 elif conf.env['CC_NAME'] == 'gcc': - conf.env.append_value('CFLAGS', ['-fvisibility=hidden', - '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))']) + geany_symbol_flags = ['-fvisibility=hidden', + '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'] else: # unknown, define to nothing - conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=']) - conf.env.append_value('CFLAGS', ['-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL']) + geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL='] + geany_symbol_flags.append('-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL') + conf.env.append_value('CFLAGS', geany_symbol_flags) + conf.env.append_value('CXXFLAGS', geany_symbol_flags) # some more compiler flags conf.env.append_value('CFLAGS', ['-DHAVE_CONFIG_H']) -- 2.11.4.GIT