From 610a7bac29a8b2fc5c6d5530c5d831344d0014d1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jul 2017 15:25:58 +0100 Subject: [PATCH] Various DLLs have different names with the MXE environment. --- platform/windows/wscript | 26 +++++++++++++------------- wscript | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/platform/windows/wscript b/platform/windows/wscript index 144696fc7..19ef13288 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,14 @@ 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 "%cdist_deps%/bin/asdcp-cth.dll" File "%cdist_deps%/bin/kumu-cth.dll" diff --git a/wscript b/wscript index 0d996dd53..edfbb07ea 100644 --- a/wscript +++ b/wscript @@ -119,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 \n int main() { std::locale::global (boost::locale::generator().generate ("")); }\n -- 2.30.2