Bump libdcp.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 800811d3d35e388f86c71f398542578d4fdea4c8..17c2006f09eaa1058eaa36479f8a98bed13527d0 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libsub.
 #
@@ -19,9 +19,10 @@
 
 import os
 
+option_defaults = { 'force-cpp11': False }
+
 def dependencies(target, options):
-    libdcp_options = { 'force-cpp11': True} if options['force-cpp11'] else {}
-    return (('asdcplib', 'carl'), ('libcxml', '0d18df4'), ('libdcp', None, libdcp_options))
+    return (('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'), ('libdcp', 'v1.8.13'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -29,22 +30,10 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-            if target.version == '7':
-                # 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.
-                cmd += ' --force-cpp11'
-        if target.distro == 'mageia' and target.version == '6':
-            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
-            cmd += ' --force-cpp11'
     if target.debug:
         cmd += ' --enable-debug'
     if target.platform == 'windows':
-        cmd += ' --target-windows --disable-tests'
-
-    if options is not None and 'force-cpp11' in options and options['force-cpp11']:
-        cmd += ' --force-cpp11'
+        cmd += f' --target-windows-{target.bits} --disable-tests'
 
     target.command(cmd)
     target.command('./waf build install')