X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=windows%2Finstaller.nsi.64.in;h=5e4298cbe09fce552a77b2f713011f4e04d04dce;hb=05c8be22fc6d81e99cee6dea203a7b118c21b8cd;hp=7820d0078c1e0eba7017f19690a53c2db57f0c35;hpb=ec672e77334379b15639b05384e443a42e29fc09;p=dcpomatic.git

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 7820d0078..5e4298cbe 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -41,7 +41,7 @@ File "%deps%/bin/asdcp-libdcp.dll"
 File "%deps%/bin/avcodec-54.dll"
 File "%deps%/bin/avfilter-3.dll"
 File "%deps%/bin/avformat-54.dll"
-File "%deps%/bin/avutil-51.dll"
+File "%deps%/bin/avutil-52.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/libintl-8.dll"
 File "%deps%/bin/kumu-libdcp.dll"
@@ -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"
@@ -69,24 +71,24 @@ File "%deps%/bin/swresample-0.dll"
 File "%deps%/bin/swscale-2.dll"
 File "%deps%/bin/zlib1.dll"
 File "%deps%/bin/libjpeg-8.dll"
-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/wxbase294u_gcc_custom.dll"
+File "%deps%/bin/wxmsw294u_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw294u_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"
+File "%deps%/bin/libpixman-1-0.dll"
+File "%deps%/bin/libfontconfig-1.dll"
+File "%deps%/bin/libexpat-1.dll"
+File "%deps%/bin/libbz2.dll"
 
 File "%binaries%/src/wx/dvdomatic-wx.dll"
 File "%binaries%/src/lib/dvdomatic.dll"
@@ -94,15 +96,28 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
+# 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 "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
-
 File "%deps%/etc/ImageMagick/delegates.xml"
 
+SetOutPath "$INSTDIR\bin\fr_FR"
+File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
+File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo"
+File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+
+SetOutPath "$INSTDIR\bin\it_IT"
+File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo"
+File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo"
+File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo"
+
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0