Merge master and multifarious hackery.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 92157a5813d4a9a122870146aabcc413f3830e91..ffbca416880d87703525b4aa4c759b1f5d672c6d 100644 (file)
--- a/cscript
+++ b/cscript
@@ -8,8 +8,8 @@ def dependencies(target):
     else:
         return (('openjpeg-cdist', None),
                 ('libcxml', None),
-                ('ffmpeg-cdist', '488d5d4496af5e3a3b9d31d6b221e8eeada6b77e'),
-                ('libdcp', 'v0.45'))
+                ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
+                ('libdcp', None))
 
 def build(env, target):
     cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
@@ -29,7 +29,7 @@ def package(env, target, version):
     if target.platform == 'windows':
         shutil.copyfile('build/windows/installer.%s.nsi' % target.bits, 'build/windows/installer2.%s.nsi' % target.bits)
         env.command('sed -i "s~%%resources%%~%s/windows~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
-        env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix(), target.bits))
+        env.command('sed -i "s~%%deps%%~%s~g" build/windows/installer2.%s.nsi' % (env.windows_prefix, target.bits))
         env.command('sed -i "s~%%binaries%%~%s/build~g" build/windows/installer2.%s.nsi' % (os.getcwd(), target.bits))
         env.command('sed -i "s~%%bits%%~32~g" build/windows/installer2.%s.nsi' % target.bits)
         env.command('makensis build/windows/installer2.%s.nsi' % target.bits)