Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0

1 files changed, 3 insertions, 3 deletions

diff --git a/cscript b/cscript
index d2375c40..7a09f0a0 100644
--- a/cscript
+++ b/cscript
@@ -35,9 +35,9 @@ import os
 
 def dependencies(target):
     if target.platform == 'windows' and target.version == 'xp':
-        return (('libcxml', 'v0.15.1'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', 'v0.1.2'))
+        return (('libcxml', 'c1348c5'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', '4c8a027'))
     else:
-        return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'v0.1.2'))
+        return (('libcxml', 'c1348c5'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', '4c8a027'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -48,7 +48,7 @@ def build(target, options):
         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-gcov'
+        cmd += ' --target-windows --disable-gcov --disable-tests'
         if target.version == 'xp':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'