Fix strange Windows build error introduced in 6c37cc1979b2a01205a888c4c98f3334685ee8dd

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index d2b0474faa8daded7e2f3a32dafe21a4eefc1392..89ecb5fdfe1f0800b627e171dde8586c86b874e0 100644 (file)
--- a/cscript
+++ b/cscript
@@ -34,14 +34,14 @@
 import os
 import shutil
 
-option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' }
+option_defaults = { 'jpeg': 'oj2' }
 
 def dependencies(target, options):
-    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'))
+    libcxml = ('libcxml', 'v0.17.0')
+    if options['jpeg'] == 'oj1':
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'bb09615'))
     else:
-        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
+        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'bb09615'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
@@ -60,20 +60,6 @@ def build(target, options):
     if target.debug:
         cmd += ' --enable-debug'
 
-    # Centos 7 ships with glibmm 2.50.0 which requires C++11
-    # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
-    # I worry that this will cause ABI problems but I don't have
-    # a better solution.  Mageia 6 pulls the same stunt except it's
-    # libxml++ that requires C++11
-    force_cpp11 = False
-    if target.platform == 'linux':
-        if target.distro == 'centos' and target.version == '7':
-            force_cpp11 = True
-        if target.distro == 'mageia' and target.version == '6':
-            force_cpp11 = True
-    if force_cpp11 or options['force-cpp11']:
-        cmd += ' --force-cpp11'
-
     target.command(cmd)
     target.command('./waf build install')