Windows environment tweaks.

2 files changed, 9 insertions, 14 deletions

diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in
index 79cd65ae1..dd24e3497 100644
--- a/windows/installer.nsi.32.in
+++ b/windows/installer.nsi.32.in
@@ -33,7 +33,7 @@ File "%deps%/bin/avfilter-3.dll"
 File "%deps%/bin/avformat-54.dll"
 File "%deps%/bin/avutil-51.dll"
 File "%deps%/bin/dcp.dll"
-File "%deps%/bin/intl.dll"
+File "%deps%/bin/libintl-8.dll"
 File "%deps%/bin/kumu-libdcp.dll"
 File "%deps%/bin/libboost_chrono-mt.dll"
 File "%deps%/bin/libboost_filesystem-mt.dll"
@@ -45,12 +45,13 @@ File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
-File "%deps%/bin/libjpeg-7.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
 File "%deps%/bin/libssh.dll"
@@ -64,17 +65,13 @@ File "%deps%/bin/wxbase28_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
 File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
-File "%deps%/bin/freetype6.dll"
+File "%deps%/bin/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
 File "%deps%/bin/libpango-1.0-0.dll"
 File "%deps%/bin/libgmodule-2.0-0.dll"
 File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
 File "%deps%/bin/libpangowin32-1.0-0.dll"
-File "%deps%/bin/libtiff3.dll"
-File "%deps%/bin/jpeg62.dll"
+File "%deps%/bin/libtiff-5.dll"
 File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libxml++-2.6-2.dll"
 File "%deps%/bin/libxml2-2.dll"
diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 7820d0078..e0f55202c 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -55,11 +55,13 @@ File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
 File "%deps%/bin/libssh.dll"
@@ -73,17 +75,13 @@ File "%deps%/bin/wxbase28_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
 File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
 File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
 File "%deps%/bin/libpango-1.0-0.dll"
 File "%deps%/bin/libgmodule-2.0-0.dll"
 File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
 File "%deps%/bin/libpangowin32-1.0-0.dll"
 File "%deps%/bin/libtiff-5.dll"
-File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libxml++-2.6-2.dll"
 File "%deps%/bin/libxml2-2.dll"