Merge master.

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 2c16858c29849be1bd92ee9629dc58287fb4f61c..19c204f6264c6506095d62a18f93c0110f8e8276 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -103,16 +103,16 @@ 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/asdcp-libdcp-1.0.dll"
+File "%cdist_deps%/bin/kumu-libdcp-1.0.dll"
 File "%cdist_deps%/bin/avcodec-55.dll"
 File "%cdist_deps%/bin/avfilter-4.dll"
 File "%cdist_deps%/bin/avformat-55.dll"
 File "%cdist_deps%/bin/avutil-52.dll"
 File "%cdist_deps%/bin/avdevice-55.dll"
-File "%cdist_deps%/bin/dcp.dll"
-File "%cdist_deps%/bin/libopenjpeg-1.dll"
 File "%cdist_deps%/bin/postproc-52.dll"
+File "%cdist_deps%/bin/dcp-1.0.dll"
+File "%cdist_deps%/bin/libopenjpeg-1.dll"
 File "%cdist_deps%/bin/swresample-0.dll"
 File "%cdist_deps%/bin/swscale-2.dll"
 File "%cdist_deps%/bin/cxml.dll"
@@ -132,22 +132,32 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
+File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
+File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
+File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
+File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
+File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo"
+SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES"
+File "%binaries%/src/lib/mo/nl_NL/libdcpomatic.mo"
+File "%binaries%/src/wx/mo/nl_NL/libdcpomatic-wx.mo"
+File "%binaries%/src/tools/mo/nl_NL/dcpomatic.mo"
+File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo"
 
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe"