X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=72128f8b0d09a455a9d4cbdd97233ed46b9f1c32;hb=b7257aefd5e7c3904e34b78b384c7577751df812;hp=df76d159350de071533e0b99d7a46196efee637a;hpb=18d009ad91436beffe7ecc263265430046203f05;p=libdcp.git

diff --git a/cscript b/cscript
index df76d159..72128f8b 100644
--- a/cscript
+++ b/cscript
@@ -36,9 +36,9 @@ import shutil
 
 def dependencies(target, options):
     if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'):
-        return (('libcxml', 'v0.15.5'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', 'f3b0fb8'))
+        return (('libcxml', '6dd54f6'), ('openjpeg-cdist',  '4233dd7'), ('asdcplib-cth', '5895644'))
     else:
-        return (('libcxml', 'v0.15.5'), ('openjpeg2-cdist', 'c40a3b8'), ('asdcplib-cth', 'f3b0fb8'))
+        return (('libcxml', '6dd54f6'), ('openjpeg2-cdist', 'c40a3b8'), ('asdcplib-cth', '5895644'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -87,8 +87,9 @@ def package(target, version):
                   'libxml2-2.dll', 'libxmlsec1-openssl.dll', 'libxmlsec1.dll', 'zlib1.dll', 'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll', 'libgobject-2.0-0.dll',
                   'libsigc-2.0-0.dll', 'libiconv-2.dll', 'liblzma-5.dll', 'libxslt-1.dll', 'libintl-8.dll', 'libpcre-1.dll', 'libffi-6.dll']:
             shutil.copyfile('%s/bin/%s' % (target.windows_prefix, f), os.path.join(d, f))
-        target.command('cd build && zip -9 -r libdcp-%s.zip libdcp-%s' % (version, version))
-        return os.path.abspath('build/libdcp-%s.zip' % version)
+        zip = 'libdcp-%s-windows-%d.zip' % (version, target.bits)
+        target.command('cd build && zip -9 -r %s libdcp-%s' % (zip, version))
+        return os.path.abspath('build/%s' % zip)
 
 def make_doxygen(target):
     os.makedirs('build/doc')