Remove unnecessary -c option for compatiblity with different versions of xmldiff.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 2c5048a9bb52393693a6b7a0e9ebb92f30f9258d..d2b0474faa8daded7e2f3a32dafe21a4eefc1392 100644 (file)
--- a/cscript
+++ b/cscript
@@ -37,14 +37,14 @@ import shutil
 option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
 
 def dependencies(target, options):
-    libcxml = ('libcxml', '0d18df4', {'force-cpp11': options['force-cpp11']})
+    libcxml = ('libcxml', 'c333199', {'force-cpp11': options['force-cpp11']})
     if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
         return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
     else:
-        return (libcxml, ('openjpeg', '956af06'), ('asdcplib', 'carl'))
+        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
 
 def build(target, options):
-    cmd = './waf configure --disable-examples --prefix=%s' % target.directory
+    cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
     cmd += ' --jpeg=%s' % options['jpeg']
     if target.platform == 'linux':
         cmd += ' --static'
@@ -56,8 +56,6 @@ def build(target, options):
         if target.version == 'xp':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'
-    elif target.platform == 'osx':
-        cmd += ' --disable-tests'
 
     if target.debug:
         cmd += ' --enable-debug'