diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-08 20:33:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-08 20:33:49 +0100 |
| commit | fbf42d70880f5bcba52f3cb53d78ee561efa6fc4 (patch) | |
| tree | 065faf820123cef85263345e426b72cf0d75d97d /src/wx | |
| parent | b205f8581c73eb8a95b2ab6e5e344480d29b1b18 (diff) | |
| parent | 6bb346e495a1286d6073d6a3c42816fb0f3526b2 (diff) | |
Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 18eb46f82..883304eff 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -53,8 +53,8 @@ def configure(conf): 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) + if wx_version != '2.9.4' and wx_version != '2.9.5': + conf.fatal('wxwidgets version 2.9.4 or 2.9.5 is required; %s found' % wx_version) def build(bld): if bld.env.STATIC: |