More uchardet stuff.

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index fc1d07b71eaaccd8341e7ccdecad7c96c458b658..ce2e55c7a7167fc00617fb8030834c452dd6beb8 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -59,7 +59,7 @@ ${EndIf}
 
     print("""
 SetOutPath "$INSTDIR\\bin"
-WriteUninstaller "$INSTDIR\Uninstall.exe"
+WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
 File "%static_deps%/bin/libintl-8.dll"
 File "%static_deps%/bin/libboost_chrono-mt.dll"
@@ -119,6 +119,8 @@ 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/uchardet.dll"
 
 File "%cdist_deps%/bin/asdcp-libdcp-1.0.dll"
 File "%cdist_deps%/bin/kumu-libdcp-1.0.dll"
@@ -210,17 +212,7 @@ File "%static_deps%/share/locale/da/LC_MESSAGES/wxstd.mo"
 
 SetOutPath "$INSTDIR"
 File "%resources%/../../LiberationSans-Regular.ttf"
-    """, file=f)
-
-    if debug:
-        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)
-    else:
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f)
-        print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
-
-    print("""
-WriteUninstaller "$INSTDIR\\Uninstall.exe"
+File "%graphics%/splash.png"
 
 CreateDirectory "$INSTDIR\etc\pango"
 ReadEnvStr $0 COMSPEC
@@ -265,7 +257,6 @@ File "%binaries%/src/tools/dcpomatic2_create.exe"
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
 
     print("""
-WriteUninstaller "$INSTDIR\\Uninstall.exe"
 SectionEnd
     """, file=f)
 
@@ -277,7 +268,7 @@ CreateDirectory "$SMPROGRAMS\\DCP-o-matic 2"
 File "%binaries%/src/tools/dcpomatic2_server_cli.exe"
 File "%binaries%/src/tools/dcpomatic2_server.exe"
 CreateShortCut "$DESKTOP\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" ""
-CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0
+CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 encode server.lnk" "$INSTDIR\\bin\\dcpomatic2_server.exe" "" "$INSTDIR\\bin\\dcpomatic2_server.exe" 0
 CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe" "" "$INSTDIR\\Uninstall.exe" 0
 SectionEnd
     """, file=f)