summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
Diffstat (limited to 'cscript')
-rw-r--r--cscript10
1 files changed, 5 insertions, 5 deletions
diff --git a/cscript b/cscript
index 5a2da6d1..f39a3773 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.
#
@@ -37,11 +37,11 @@ import shutil
option_defaults = { 'jpeg': 'oj2' }
def dependencies(target, options):
- libcxml = ('libcxml', 'v0.17.2')
+ libcxml = ('libcxml', '6c374a1fa54d7b9827500449275e5f454e2be292')
if options['jpeg'] == 'oj1':
- return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'bb09615'))
+ return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'))
else:
- return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', 'bb09615'))
+ 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-gcov --disable-tests'
if target.version == 'xp':
# OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
cmd += ' --jpeg=oj1'