summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-25 14:06:39 +0000
committerCarl Hetherington <cth@carlh.net>2013-06-25 14:06:39 +0000
commit7699a43eab349c8d16dd084f457fe48363c70a5d (patch)
treecff9f29841ff0c2369496e394864c6f811ba67f8 /src
parent382b4cc62204a3a627a30e467c3beda81006cec6 (diff)
Hack to link wxwidgets statically on --static.
Diffstat (limited to 'src')
-rw-r--r--src/wx/wscript11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/wx/wscript b/src/wx/wscript
index 1ad1aa9cb..9213d7220 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -26,7 +26,16 @@ sources = """
def configure(conf):
conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config,
- args='--cppflags --cxxflags --libs', uselib_store='WXWIDGETS', mandatory=True)
+ 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.
+ 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.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
conf.im_msg = 0