X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=750fd758d8ed85b60cc7a5d62dc3b1c2542b4dfe;hb=bea0786a2de854964248778526bb084cc21e04a8;hp=4004cbdc3a61ae2d7e2d2a3e0501a8d1a00c4584;hpb=e12d8d46c11cdec8e7d7f9d2a0a31a32a3606473;p=dcpomatic.git

diff --git a/cscript b/cscript
index 4004cbdc3..750fd758d 100644
--- a/cscript
+++ b/cscript
@@ -3,11 +3,8 @@ import shutil
 import os
 
 def dependencies(target):
-    if target.platform == 'windows':
-        return ()
-    else:
-        return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'),
-                ('libdcp', 'ee5e932cf0afa1ce24ea5eb0f298be8009cd9689'))
+    return (('ffmpeg-cdist', 'b1219246a0cce9a4b916669d506bb33c925225c3'),
+            ('libdcp', 'ef26e37fce728cba6fb50e9e6743a012b1bbbf64'))
 
 def build(target):
     cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -27,7 +24,8 @@ def package(target, version):
     if target.platform == 'windows':
         shutil.copyfile('build/platform/windows/installer.%s.nsi' % target.bits, 'build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('sed -i "s~%%resources%%~%s/platform/windows~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        target.command('sed -i "s~%%deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, target.bits))
+        target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.work_dir_cscript(), target.bits))
         target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
         target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % target.bits)
         target.command('makensis build/platform/windows/installer2.%s.nsi' % target.bits)