X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cscript;h=2010462d385f8cf76e7f9bcaa0fc6e16b56c883c;hb=e3c66895937d334ceb6d9c310941e2fbeae0e6dc;hp=259e5bfe03299b385e7ff7d2dc7447c9a4bc25d8;hpb=bc18fb2581d0910aa86b994ceef647267ca4e71d;p=libsub.git

diff --git a/cscript b/cscript
index 259e5bf..2010462 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,28 @@
+#
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libsub.
+#
+#    libsub is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libsub is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libsub.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', '5895644'), ('libcxml', '6dd54f6'), ('libdcp', '63bff14'))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    return (('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'), ('libdcp', 'v1.8.33'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,19 +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'
+        cmd += f' --target-windows-{target.bits} --disable-tests'
 
     target.command(cmd)
     target.command('./waf build install')