Basic try to put i18n into windows installers.

[dcpomatic.git] / windows / installer.nsi.64.in

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 39af84878d64a35a06a991190dfba51ec12e8ed4..33e3c7fe17da437525e869ec5623e678b94fe65a 100644 (file)
--- 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"
@@ -71,9 +71,9 @@ 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/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
@@ -85,6 +85,10 @@ 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"
+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"
@@ -92,13 +96,23 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
+SetOutPath "$INSTDIR\locale\fr_FR"
+
+File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo"
+File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo"
+
+# 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"
 
 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