Try to fix linking to wxWidgets deps with --static.
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Jul 2013 21:40:44 +0000 (22:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Jul 2013 21:40:44 +0000 (22:40 +0100)
src/wx/wscript

index 4bc79d6bb61b812c1fc04b73f8a5a6af446d7127..acff351fa0074d859aecea531900fa7f87a83fc1 100644 (file)
@@ -25,8 +25,11 @@ sources = """
           """
 
 def configure(conf):
-    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config,
-                   args='--cppflags --cxxflags --libs',
+    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
                    uselib_store='WXWIDGETS', mandatory=True)
  
     if conf.env.STATIC: