X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f2b07d1277949c372e3d5144da12c71477afb298;hb=e0ce01d697dc48e3441716b99290b1017822aa2c;hp=bceb63ef6bf2d04e4b44a874c933393e08dfac42;hpb=9a97bd977949d7b22595aa16f1400bae85727301;p=libdcp.git

diff --git a/cscript b/cscript
index bceb63ef..f2b07d12 100644
--- a/cscript
+++ b/cscript
@@ -1,18 +1,20 @@
 import os
 
 def dependencies(target):
-    return (('libcxml', None), ('openjpeg-cdist', '13b69c2'))
+    return (('libcxml', 'v0.15.0'), ('openjpeg2-cdist', '63c1932'))
 
 def build(target, options):
-    cmd = './waf configure --prefix=%s' % target.directory
+    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
     if target.platform == 'linux':
         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'
+        cmd += ' --target-windows --disable-gcov'
     elif target.platform == 'osx':
-        cmd += ' --target-osx'
+        cmd += ' --disable-tests'
 
     if target.debug:
         cmd += ' --enable-debug'
@@ -24,3 +26,8 @@ def make_doxygen(target):
     os.makedirs('build/doc')
     target.command('doxygen')
     return os.path.abspath('build/doc/html')
+
+def test(target):
+    if target.platform != 'windows':
+        target.set('LC_ALL', 'C')
+        target.command('run/tests')