summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cscript2
-rw-r--r--src/wx/wscript4
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index 4d5b4bf1a..4004cbdc3 100644
--- a/cscript
+++ b/cscript
@@ -7,7 +7,7 @@ def dependencies(target):
return ()
else:
return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'),
- ('libdcp', '6b3a021409b55e0b5988a0bb993020f6c0e66276'))
+ ('libdcp', 'ee5e932cf0afa1ce24ea5eb0f298be8009cd9689'))
def build(target):
cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
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: