Fix order of InstallDir setup so that suggested value is

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index d3b16435f1ec2273c6c4f075a41c477134b0d084..cb0a642651250b6090ebc68b67c6fa04863ed917 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -31,10 +31,15 @@ def write_installer(bits, version, debug):
 !include "Sections.nsh"
     """, file=f)
 
+    if bits == 64:
+        program_files = "$PROGRAMFILES64"
+    else:
+        program_files = "$PROGRAMFILES"
+
     if debug:
-        print('InstallDir "$PROGRAMFILES\\DCP-o-matic 2 Debug"', file=f)
+        print('InstallDir "%s\\DCP-o-matic 2 Debug"' % program_files, file=f)
     else:
-        print('InstallDir "$PROGRAMFILES\\DCP-o-matic 2"', file=f)
+        print('InstallDir "%s\\DCP-o-matic 2"' % program_files, file=f)
 
     print("""
 !insertmacro MUI_PAGE_WELCOME
@@ -48,13 +53,8 @@ SectionIn RO
 
     if bits == 64:
         print("""
-${If} ${RunningX64}
-   DetailPrint "Installer running on 64-bit host"
-   ; disable registry redirection (enable access to 64-bit portion of registry)
-   SetRegView 64
-   ; change install dir
-   StrCpy $INSTDIR "$PROGRAMFILES64\DCP-o-matic 2"
-${EndIf}
+; disable registry redirection (enable access to 64-bit portion of registry)
+SetRegView 64
         """, file=f)
 
     print("""