X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=292b0d2f344f11eb7cf7be99b7216646581529f4;hb=0271d2fa098e9b7b4b440ae6ae50bb01655264ae;hp=37dc1def9d4819a84cb5aab451210f01942d2ca9;hpb=c33c7fce6e8d599681f799b691d5ff08ff67e7f6;p=libsub.git

diff --git a/cscript b/cscript
index 37dc1de..292b0d2 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', 'v0.1.3'), ('libcxml', 'v0.15.4'), ('libdcp', '15f7f4a'))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    return (('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'), ('libdcp', 'v1.8.11'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,12 +30,10 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
     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')