summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-06-25 12:30:04 +0100
committerCarl Hetherington <cth@carlh.net>2013-06-25 12:30:04 +0100
commitf11de0c96cb593f45cf24d60cbd493214555efb2 (patch)
treeb79d9be26ffc335f76c95238fb5c44be871942b1 /src
parent5c44164020dd7a440d9f9752cf55e2f41ccd72a7 (diff)
Try to insist on wxWidgets 2.9.4 to avoid weirdnesses with wxDirPickerCtrl.
Diffstat (limited to 'src')
-rw-r--r--src/wx/wscript8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/wx/wscript b/src/wx/wscript
index 1c5e3b8cc..1ad1aa9cb 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -25,7 +25,13 @@ sources = """
"""
def configure(conf):
- conf.check_cfg(package = '', path = conf.options.wx_config, args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+ conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config,
+ args='--cppflags --cxxflags --libs', uselib_store='WXWIDGETS', mandatory=True)
+ conf.in_msg = 1
+ wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
+ conf.im_msg = 0
+ if wx_version != '2.9.4':
+ conf.fatal('wxwidgets version 2.9.4 is required; %s found' % wx_version)
def build(bld):
if bld.env.STATIC: