diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-26 23:36:24 +0100 |
| commit | 4616b19fb5241a54c9d57f7a91bb975f41aed14b (patch) | |
| tree | d067450cb12dd3629fe88ef9a578c6b1cabe7884 /src/wx/wscript | |
| parent | f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef (diff) | |
| parent | 20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff) | |
Merge master.
Diffstat (limited to 'src/wx/wscript')
| -rw-r--r-- | src/wx/wscript | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 0c87c09be..bc21f9d81 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -64,6 +64,10 @@ def configure(conf): conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0', 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] + if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE: + conf.env.LIB_WXWIDGETS.append('Xxf86vm') + conf.env.LIB_WXWIDGETS.append('Xext') + conf.env.LIB_WXWIDGETS.append('X11') conf.in_msg = 1 wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() |