Merge mxe branch.

1 files changed, 29 insertions, 19 deletions

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 144696fc7..c42bbca7f 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -75,27 +75,27 @@ File "%static_deps%/bin/libintl-8.dll"
 File "%static_deps%/bin/libboost_chrono-mt.dll"
 File "%static_deps%/bin/libboost_filesystem-mt.dll"
 File "%static_deps%/bin/libboost_system-mt.dll"
-File "%static_deps%/bin/libboost_thread-mt.dll"
+File "%static_deps%/bin/libboost_thread_win32-mt.dll"
 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_sjlj-1.dll"
+File "%static_deps%/bin/libgcc_s_seh-1.dll"
 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"
 File "%static_deps%/bin/libiconv-2.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
-File "%static_deps%/bin/libMagick++-6.Q16-3.dll"
-File "%static_deps%/bin/libMagickCore-6.Q16-1.dll"
-File "%static_deps%/bin/libMagickWand-6.Q16-1.dll"
-File "%static_deps%/bin/libpng15-15.dll"
+File "%static_deps%/bin/libjpeg-9.dll"
+File "%static_deps%/bin/libGraphicsMagick-3.dll"
+File "%static_deps%/bin/libGraphicsMagickWand-2.dll"
+File "%static_deps%/bin/libGraphicsMagick++-11.dll"
+File "%static_deps%/bin/libpng16-16.dll"
 File "%static_deps%/bin/libsigc-2.0-0.dll"
 File "%static_deps%/bin/libsndfile-1.dll"
 File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
-File "%static_deps%/bin/libjpeg-8.dll"
+File "%static_deps%/bin/libjpeg-9.dll"
 File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
@@ -125,14 +125,30 @@ File "%static_deps%/bin/libffi-6.dll"
 File "%static_deps%/bin/openssl.exe"
 File "%static_deps%/bin/libcurl-4.dll"
 File "%static_deps%/bin/ssleay32.dll"
-File "%static_deps%/bin/libzip-2.dll"
+File "%static_deps%/bin/libzip-4.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/libsamplerate-0.dll"
-File "%static_deps%/bin/libnettle-6-2.dll"
-File "%static_deps%/lib/icuuc52.dll"
-File "%static_deps%/lib/icudt52.dll"
-File "%static_deps%/lib/icuin52.dll"
+File "%static_deps%/bin/libnettle-6.dll"
+File "%static_deps%/bin/icuuc56.dll"
+File "%static_deps%/bin/icudt56.dll"
+File "%static_deps%/bin/icuin56.dll"
+File "%static_deps%/bin/liblzma-5.dll"
+File "%static_deps%/bin/libpcre-1.dll"
+File "%static_deps%/bin/libharfbuzz-0.dll"
+File "%static_deps%/bin/libjasper-1.dll"
+File "%static_deps%/bin/liblcms2-2.dll"
+File "%static_deps%/bin/libwinpthread-1.dll"
+File "%static_deps%/bin/libgnutls-30.dll"
+File "%static_deps%/bin/libgmp-10.dll"
+File "%static_deps%/bin/libhogweed-4.dll"
+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 "%static_deps%/bin/libpangoft2-1.0-0.dll"
+File "%static_deps%/bin/libx264-148.dll"
 
 File "%cdist_deps%/bin/asdcp-cth.dll"
 File "%cdist_deps%/bin/kumu-cth.dll"
@@ -168,12 +184,6 @@ File "%cdist_deps%/bin/ffprobe.exe"
 
     print("""
 SetOutPath "$INSTDIR\\bin"
-# I don't know why, but sometimes it seems that
-# delegates.xml must be in with the binaries, and
-# sometimes in the $PROFILE.  Meh.
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
-SetOutPath "$PROFILE\\.magick"
-File "%static_deps%/etc/ImageMagick-6/delegates.xml"
 
 SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic2.mo"