X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ed57f02f094d00f1a1a972cfcd99bb699ae78bf1;hb=59f63e2b6d0dba963faee7dfee54fbb48dee396a;hp=b1397d6e87e4f40d2a70286e9cce68a65291ac68;hpb=b4e75d642c809fa38b45a4e54ea1ab7eca16e04f;p=dcpomatic.git

diff --git a/cscript b/cscript
index b1397d6e8..ed57f02f0 100644
--- a/cscript
+++ b/cscript
@@ -155,12 +155,14 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '1093c6f'),
+    return (('ffmpeg-cdist', 'f69bb08'),
             ('libdcp', '1.0'),
-            ('libsub', None))
+            ('libsub', '1.0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
+    if target.debug:
+        cmd += ' --enable-debug'
     if target.platform == 'windows':
         cmd += ' --target-windows'
     elif target.platform == 'linux':
@@ -185,6 +187,7 @@ def package_windows(target):
     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~%%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.directory, target.bits))
+    target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, 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)