X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ba4a7e4c4802505b2b207a88b5654d41bff79143;hb=730952e63932bd50310cb20c61e78ae0c215e14b;hp=2682439eab8b227e8b860d0cecfad34c504a2d20;hpb=5346d1c9fe7e85e8d7343fcafdeda8c4834f7aa2;p=libdcp.git

diff --git a/cscript b/cscript
index 2682439e..ba4a7e4c 100644
--- a/cscript
+++ b/cscript
@@ -34,10 +34,10 @@
 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']})
+    libcxml = ('libcxml', 'v0.17.0')
     if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1':
         return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl'))
     else:
@@ -56,26 +56,10 @@ 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'
 
-    # 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')