X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=996d8acd09fbce41e9a81afd3e15c5d4fd0c4540;hb=ef0d988398581bb0c4d96c9f9603bf48bad3c8a8;hp=64726629ed8f6240494a38a992d1ee8e3450e140;hpb=98ca07e59feac950838412bfa7e5c2e3ddd71d7e;p=dcpomatic.git

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 64726629e..996d8acd0 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -128,7 +128,6 @@ 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 "%static_deps%/bin/libsamplerate-0.dll"
 File "%static_deps%/bin/libnettle-6-2.dll"
 File "%static_deps%/lib/icuuc52.dll"
@@ -160,6 +159,7 @@ File "%cdist_deps%/bin/ffprobe.exe"
         print('File "%resources%/gdb_script"', file=f)
         print('File "%resources%/dcpomatic2_debug.bat"', file=f)
         print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f)
+        print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f)
         print('File "%mingw%/gdb.exe"', file=f)
         print('File "%mingw%/addr2line.exe"', file=f)
     else:
@@ -167,11 +167,6 @@ File "%cdist_deps%/bin/ffprobe.exe"
         print('File "%binaries%/src/lib/dcpomatic2.dll"', file=f)
 
     print("""
-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
@@ -257,11 +252,6 @@ File "%resources%/../../fonts/LiberationSans-Italic.ttf"
 File "%resources%/../../fonts/LiberationSans-Bold.ttf"
 File "%graphics%/splash.png"
 
-CreateDirectory "$INSTDIR\etc\pango"
-ReadEnvStr $0 COMSPEC
-SetOutPath "$INSTDIR"
-nsExec::ExecToLog '$0 /C bin\pango-querymodules.exe > etc\pango\pango.modules'
-
 SectionEnd
     """, file=f)
 
@@ -287,7 +277,8 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe"
 
     if debug:
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f)
-        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "DisplayName" "DCP-o-matic 2 debug (remove only)"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
@@ -305,6 +296,7 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe"
         print('Section "DCP-o-matic 2 debug desktop shortcuts" SEC_MASTER_DESKTOP', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
+        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
     else:
         print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f)
@@ -365,6 +357,7 @@ RMDir /r "$INSTDIR\\*.*"
 RMDir "$INSTDIR"
 Delete "$DESKTOP\\DCP-o-matic 2 debug.lnk"
 Delete "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk"
+Delete "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk"
 Delete "$SMPROGRAMS\\DCP-o-matic 2 debug\\*.*"
 RmDir  "$SMPROGRAMS\\DCP-o-matic 2 debug"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\\DCP-o-matic 2 debug"