Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index c09a714ec6cc0cae66f10d893e0132bd0a2d9b1f..7e92fb2d55c3442013cbda2cce822100310f8617 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -108,23 +108,23 @@ File "%static_deps%/bin/pango-querymodules.exe"
 
 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/postproc-52.dll"
+File "%cdist_deps%/bin/avcodec-56.dll"
+File "%cdist_deps%/bin/avfilter-5.dll"
+File "%cdist_deps%/bin/avformat-56.dll"
+File "%cdist_deps%/bin/avutil-54.dll"
+File "%cdist_deps%/bin/avdevice-56.dll"
+File "%cdist_deps%/bin/postproc-53.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/swresample-1.dll"
+File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/ffprobe.exe"
 
 File "%binaries%/src/wx/dcpomatic2-wx.dll"
 File "%binaries%/src/lib/dcpomatic2.dll"
 
-SetOutPath "$INSTDIR\\lib"
+SetOutPath "$INSTDIR\\lib\\pango\\1.8.0\\modules"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-arabic-lang.dll"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-basic-win32.dll"
 File "%static_deps%/lib/pango/1.8.0/modules/pango-indic-lang.dll"
@@ -172,6 +172,7 @@ WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"
 WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
+CreateDirectory "$INSTDIR\etc\pango"
 ReadEnvStr $0 COMSPEC
 SetOutPath "$INSTDIR"
 nsExec::ExecToLog '$0 /C bin\pango-querymodules.exe > etc\pango\pango.modules'