X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=5f19eff3caa24c0b7c11452a2d1768d2ff04a474;hb=b28be8a5d9610dc8c83a19d1d531f9ebf21e1492;hp=75b42aee3205a8eddb0dd380abc32992434dd384;hpb=8df5f582bfe2b3750547f2645cc85a8f00dc433a;p=libdcp.git

diff --git a/cscript b/cscript
index 75b42aee..5f19eff3 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', 'v0.12.0'), ('openjpeg-cdist', '5d8bffd'))
+    return (('libcxml', 'v0.15.0'), ('openjpeg2-cdist', '63c1932'), ('asdcplib-cth', 'carl'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -9,8 +9,10 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
+        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
+            target.append_with_space('CXXFLAGS', '-std=c++11')
     elif target.platform == 'windows':
-        cmd += ' --target-windows --disable-tests'
+        cmd += ' --target-windows --disable-gcov'
     elif target.platform == 'osx':
         cmd += ' --disable-tests'