diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-02 11:32:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-02 11:32:12 +0100 |
| commit | 6d1704b2e42c5972bca8e2e5e0b16bf79908603f (patch) | |
| tree | 78814880968e4710666870516a8dca925d94b578 /src | |
| parent | 53ae202ce4fded1e2e90f0b34479870ee08b8d68 (diff) | |
| parent | 3e5ad422551b067e9b2002c3088d6cf70d2e026f (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wscript | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 4bc79d6bb..345c02b08 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -25,17 +25,16 @@ sources = """ """ def configure(conf): - conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, - args='--cppflags --cxxflags --libs', + 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. + # 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 |