Merge master.

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 9c3517fe35688a4c8fed9b643c48673d2ccfe034..82ee5ac127110ee59b9f6f379a63536023cda462 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -104,6 +104,7 @@ File "%static_deps%/bin/ssleay32.dll"
 File "%static_deps%/bin/libzip-2.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
+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"
@@ -123,6 +124,12 @@ File "%cdist_deps%/bin/ffprobe.exe"
 File "%binaries%/src/wx/dcpomatic2-wx.dll"
 File "%binaries%/src/lib/dcpomatic2.dll"
 
+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"
+
+SetOutPath "$INSTDIR\\bin"
 # I don't know why, but sometimes it seems that 
 # delegates.xml must be in with the binaries, and
 # sometimes in the $PROFILE.  Meh.
@@ -165,6 +172,11 @@ 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'
+
 SectionEnd
 
 Section "DCP-o-matic" SEC_MASTER