From d31f8eef7952d645580e989ca4ed3fcfadaaa642 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 23:19:50 +0100 Subject: Another try at the static wx deps. --- src/wx/wscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wx/wscript b/src/wx/wscript index 019362e9f..bbe82aba6 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -36,8 +36,11 @@ def configure(conf): # 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. - 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'] + 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) conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() -- cgit v1.2.3