X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cscript;h=f319f180fc5d8c98b769f291b8bbbecbdaa7e53e;hb=ed1f39dc5664d642f0f5af1a606e2e7aebd5e5f4;hp=d2b0474faa8daded7e2f3a32dafe21a4eefc1392;hpb=45c071647463ef7a4e18faae31d1523cae11821f;p=libdcp.git

diff --git a/cscript b/cscript
index d2b0474f..f319f180 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libdcp.
 #
@@ -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.3')
+    if options['jpeg'] == 'oj1':
+        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
     else:
-        return (libcxml, ('openjpeg', '585b84a'), ('asdcplib', 'carl'))
+        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
@@ -52,7 +52,7 @@ def build(target, options):
             # We only build tests on Ubuntu 18.04
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
-        cmd += ' --target-windows --disable-gcov --disable-tests'
+        cmd += f' --target-windows-{target.bits} --disable-tests'
         if target.version == 'xp':
             # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
             cmd += ' --jpeg=oj1'
@@ -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')