Fix misunderstandings in decoder frame handling for 3D/3D-alternate.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 3724ab4b12225e9392859e393a3c9ba4fc801618..5164bfeefdb3b28366e6927cbf7e34ded5f8ee43 100644 (file)
--- a/cscript
+++ b/cscript
@@ -233,8 +233,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', 'b105b7d'),
-            ('libsub', '79e49c2'))
+            ('libdcp', '6527778'),
+            ('libsub', '3db5052'))
 
 def configure_options(target):
     opt = ''
@@ -251,6 +251,10 @@ def configure_options(target):
             elif target.version == '7':
                 opt += ' --workaround-gssapi --static-xmlpp'
 
+    # Build Windows debug versions with static linking as I think gdb works better then
+    if target.debug and target.platform == 'windows':
+        opt += ' --static-dcpomatic'
+
     return opt
 
 def build(target, options):
@@ -360,7 +364,7 @@ def package(target, version):
             return package_rpm(target, cpu, version)
     elif target.platform == 'osx':
         target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
-        return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])
+        return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
 
 def make_pot(target):
     target.command('./waf pot')