Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

2 files changed, 18 insertions, 4 deletions

diff --git a/cscript b/cscript
index c87cca371..1e2bbeec6 100644
--- a/cscript
+++ b/cscript
@@ -295,8 +295,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'mxe', ffmpeg_options),
-            ('libdcp', '37ad399'),
-            ('libsub', '40686a2'),
+            ('libdcp', '047d8ff'),
+            ('libsub', '4af2a09'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
diff --git a/platform/windows/wscript b/platform/windows/wscript
index c42bbca7f..f47d3b54f 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -80,7 +80,14 @@ File "%static_deps%/bin/libboost_date_time-mt.dll"
 File "%static_deps%/bin/libboost_locale-mt.dll"
 File "%static_deps%/bin/libboost_regex-mt.dll"
 File "%static_deps%/bin/libeay32.dll"
-File "%static_deps%/bin/libgcc_s_seh-1.dll"
+""", file=f)
+
+    if bits == 32:
+        print('File "%static_deps%/bin/libgcc_s_sjlj-1.dll"', file=f)
+    else:
+        print('File "%static_deps%/bin/libgcc_s_seh-1.dll"', file=f)
+
+    print("""
 File "%static_deps%/bin/libgio-2.0-0.dll"
 File "%static_deps%/bin/libglib-2.0-0.dll"
 File "%static_deps%/bin/libgobject-2.0-0.dll"
@@ -146,7 +153,14 @@ File "%static_deps%/bin/libidn2-0.dll"
 File "%static_deps%/bin/libunistring-2.dll"
 File "%static_deps%/bin/libssh2-1.dll"
 File "%static_deps%/bin/libgcrypt-20.dll"
-File "%static_deps%/bin/libgpg-error6-0.dll"
+""", file=f)
+    
+    if bits == 32:
+        print('File "%static_deps%/bin/libgpg-error-0.dll"', file=f)
+    else:
+        print('File "%static_deps%/bin/libgpg-error6-0.dll"', file=f)
+
+    print("""
 File "%static_deps%/bin/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libx264-148.dll"