Add -x32/-x64 suffix to boost libraries when building for Windows.

[libdcp.git] / cscript

diff --git a/cscript b/cscript
index 5a2da6d1d03a419ce8f13407475db5ed3de06d54..e283fb344eeb70d54ecc0f63dd2b321909d7fea1 100644 (file)
--- 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', 'v0.17.3')
     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'