Merge master.

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

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index 295f926b630afcbe9fdaef86c5de27657945223e..3b53c637b7feaf00cff31f8769ec884a7ed2ee8c 100644 (file)
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -38,9 +38,9 @@ ${EndIf}
 SetOutPath "$INSTDIR\bin"
 
 File "%deps%/bin/asdcp-libdcp.dll"
-File "%deps%/bin/avcodec-54.dll"
+File "%deps%/bin/avcodec-55.dll"
 File "%deps%/bin/avfilter-3.dll"
-File "%deps%/bin/avformat-54.dll"
+File "%deps%/bin/avformat-55.dll"
 File "%deps%/bin/avutil-52.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/libintl-8.dll"
@@ -103,14 +103,22 @@ File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
 File "%deps%/etc/ImageMagick/delegates.xml"
 
-SetOutPath "$INSTDIR\bin\fr_FR"
+SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES"
 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"
+SetOutPath "$INSTDIR\locale\it\LC_MESSAGES"
 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"
+SetOutPath "$INSTDIR\locale\es\LC_MESSAGES"
+File "%binaries%/src/lib/mo/es_ES/libdvdomatic.mo"
+File "%binaries%/src/wx/mo/es_ES/libdvdomatic-wx.mo"
+File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo"
+SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES"
+File "%binaries%/src/lib/mo/sv_SE/libdvdomatic.mo"
+File "%binaries%/src/wx/mo/sv_SE/libdvdomatic-wx.mo"
+File "%binaries%/src/tools/mo/sv_SE/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" ""