Use the same ContextID whenever encrypting the picture asset for a project;

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 566381904927be3ee29d636d1c9cdf5c148640d6..e8bcf00915c3101fb507c91a588783f90cdb5c8f 100644 (file)
--- a/cscript
+++ b/cscript
@@ -233,8 +233,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', 'fe83eb5'),
-            ('libsub', '067c21c'))
+            ('libdcp', 'd23e6e1'),
+            ('libsub', 'ef7c2ec'))
 
 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')