X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=6b221e41646357727e8000726c851f43ce9f1e72;hb=509da5ec56689f7ce5f1e114542f1abf3ccfb641;hp=a5c0900c121fd73a830445c3207206e3682032a9;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/cscript b/cscript
index a5c0900c1..6b221e416 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', '2dffa11'),
-            ('libdcp', '1.0'),
-            ('libsub', None))
+    return (('ffmpeg-cdist', 'f69bb08'),
+            ('libdcp', 'df47103'),
+            ('libsub', 'f66b11f'))
 
 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)