From a75eda48d2f360c065471ccff540f189c076d80c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 22:42:18 +0000 Subject: [PATCH] More wx dep hacks. --- src/wx/wscript | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index bbe82aba6..345c02b08 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -25,23 +25,16 @@ sources = """ """ def configure(conf): - wx_args = '--cppflags --cxxflags --libs' - if conf.env.STATIC: - wx_args += ' --static' - - conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=wx_args, + conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args='--cppflags --cxxflags --libs', uselib_store='WXWIDGETS', mandatory=True) - - if conf.env.STATIC: - # wx-config returns its static libraries as full paths, without -l prefixes, which I think confuses - # check_cfg(), so it ends up putting these libraries before even the .cc file when linking. - # This hack works around that. - extras = ['wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9', - 'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9'] - - for e in extras: - conf.env.STLIB_WXWIDGETS.append(e) + if conf.env.STATIC: + # wx-config returns its static libraries as full paths, without -l prefixes, which confuses + # check_cfg(), so just hard-code it all. + conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9', + 'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9'] + conf.env.LIB_WXWIDGETS = ['tiff', 'SM'] + conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() conf.im_msg = 0 -- 2.30.2