Merge mxe branch.

6 files changed, 36 insertions, 28 deletions

diff --git a/cscript b/cscript
index 09ced5bfc..c87cca371 100644
--- a/cscript
+++ b/cscript
@@ -294,9 +294,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
-            ('libdcp', 'a6a4c47'),
-            ('libsub', 'a25cc3f'),
+    return (('ffmpeg-cdist', 'mxe', ffmpeg_options),
+            ('libdcp', '37ad399'),
+            ('libsub', '40686a2'),
             ('rtaudio-cdist', None))
 
 def configure_options(target):
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"
diff --git a/src/lib/wscript b/src/lib/wscript
index 39ebc5af2..7fa32c7e7 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -177,7 +177,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
+        obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'
 
diff --git a/src/tools/wscript b/src/tools/wscript
index 9e3614082..00f3123c6 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -33,7 +33,7 @@ def build(bld):
     uselib += 'MAGICK SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO '
 
     if bld.env.TARGET_WINDOWS:
-        uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
+        uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER '
 
     for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']:
         obj = bld(features='cxx cxxprogram')
diff --git a/test/wscript b/test/wscript
index e4a391f8b..bf22575f3 100644
--- a/test/wscript
+++ b/test/wscript
@@ -36,7 +36,7 @@ def build(bld):
     obj.uselib =  'BOOST_TEST BOOST_THREAD BOOST_FILESYSTEM BOOST_DATETIME SNDFILE SAMPLERATE DCP FONTCONFIG CAIROMM PANGOMM XMLPP '
     obj.uselib += 'AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE SWRESAMPLE POSTPROC CXML MAGICK SUB GLIB CURL SSH XMLSEC BOOST_REGEX ICU NETTLE '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE '
+        obj.uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE '
     obj.use    = 'libdcpomatic2'
     obj.source = """
                  4k_test.cc
diff --git a/wscript b/wscript
index 89f2f9407..edfbb07ea 100644
--- a/wscript
+++ b/wscript
@@ -111,9 +111,7 @@ def configure(conf):
             conf.env.append_value('CXXFLAGS', ['-mconsole'])
             conf.env.append_value('LINKFLAGS', ['-mconsole'])
         conf.check(lib='ws2_32', uselib_store='WINSOCK2', msg="Checking for library winsock2")
-        conf.check(lib='bfd', uselib_store='BFD', msg="Checking for library bfd")
         conf.check(lib='dbghelp', uselib_store='DBGHELP', msg="Checking for library dbghelp")
-        conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
         conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
         conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
         conf.check(lib='ole32', uselib_store='OLE32', msg="Checking for library ole32")
@@ -121,7 +119,7 @@ def configure(conf):
         conf.check(lib='winmm', uselib_store='WINMM', msg="Checking for library winmm")
         conf.check(lib='ksuser', uselib_store='KSUSER', msg="Checking for library ksuser")
         boost_lib_suffix = '-mt'
-        boost_thread = 'boost_thread-mt'
+        boost_thread = 'boost_thread_win32-mt'
         conf.check_cxx(fragment="""
                                #include <boost/locale.hpp>\n
                                int main() { std::locale::global (boost::locale::generator().generate ("")); }\n