X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b83a4c01d4b9ac1395ef8b70bae2671ee3a10c05;hb=5a2ff19aae77300a40e253d70d03865815070986;hp=a420b98a35912da28d9ebd3d6cb50bc7b338ceba;hpb=47727a7c80b60a0fd0ce18d8347b14241fc48f97;p=libsub.git diff --git a/cscript b/cscript index a420b98..b83a4c0 100644 --- a/cscript +++ b/cscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2020 Carl Hetherington +# Copyright (C) 2012-2021 Carl Hetherington # # This file is part of libsub. # @@ -22,9 +22,7 @@ import os option_defaults = { 'force-cpp11': False } def dependencies(target, options): - libdcp = ('libdcp', '0f1034f') - libcxml = ('libcxml', 'c336f86') - return (('asdcplib', 'carl'), libcxml, libdcp) + return (('asdcplib', 'a276ed1c5a43a92dd2b9ca93072ce8d024329e82'), ('libdcp', 'v1.8.28')) def build(target, options): cmd = './waf configure --prefix=%s' % target.directory @@ -35,7 +33,7 @@ def build(target, options): 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')