Merge master.

[dcpomatic.git] / platform / windows / installer.nsi.32.in

diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index e615f176d69eb15777478554b3c81b57710f3024..629edd50cc3842c16d03f936f98b4dfa4be82543 100644 (file)
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -28,12 +28,12 @@ Section "install" "Installation info"
 SetOutPath "$INSTDIR\bin"
 
 File "%static_deps%/bin/libintl-8.dll"
-File "%static_deps%/bin/kumu-libdcp.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_win32-mt.dll"
 File "%static_deps%/bin/libboost_date_time-mt.dll"
+File "%static_deps%/bin/libboost_locale-mt.dll"
 File "%static_deps%/bin/libeay32.dll"
 File "%static_deps%/bin/libgcc_s_sjlj-1.dll"
 File "%static_deps%/bin/libgio-2.0-0.dll"
@@ -41,7 +41,7 @@ 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-2.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"
@@ -54,6 +54,9 @@ File "%static_deps%/bin/libjpeg-8.dll"
 File "%static_deps%/bin/wxbase294u_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll"
 File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll"
 File "%static_deps%/bin/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"
@@ -74,8 +77,13 @@ File "%static_deps%/bin/libxmlsec1-openssl.dll"
 File "%static_deps%/bin/libexslt-0.dll"
 File "%static_deps%/bin/libxslt-1.dll"
 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 "%cdist_deps%/bin/asdcp-libdcp.dll"
+File "%cdist_deps%/bin/kumu-libdcp.dll"
 File "%cdist_deps%/bin/avcodec-55.dll"
 File "%cdist_deps%/bin/avfilter-3.dll"
 File "%cdist_deps%/bin/avformat-55.dll"