aboutsummaryrefslogtreecommitdiff
path: root/project/Win32BuildSetup
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2017-05-08 21:04:48 +0200
committerRechi <Rechi@users.noreply.github.com>2017-05-08 21:04:48 +0200
commit937e38df5eb0192dee282f26365e4b841eb72724 (patch)
tree7393de23be31aeb647dce1a6ff81690df1855eab /project/Win32BuildSetup
parent411a35a56202c7abd26164816e22fa6ee862b5bf (diff)
[windows][installer] set InstallDir for x64
Diffstat (limited to 'project/Win32BuildSetup')
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index 0e5452a811..e33f6cfe5a 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -19,7 +19,11 @@
OutFile "${APP_NAME}Setup-${app_revision}-${app_branch}.exe"
;Default installation folder
+!ifdef x64
+ InstallDir "$PROGRAMFILES64\${APP_NAME}"
+!else
InstallDir "$PROGRAMFILES\${APP_NAME}"
+!endif
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\${APP_NAME}" ""
@@ -333,6 +337,7 @@ SectionGroupEnd
Function .onInit
!ifdef x64
+ SetRegView 64
${IfNot} ${RunningX64}
MessageBox MB_OK|MB_ICONSTOP 'This is the 64-bit ${APP_NAME} installer.$\nPlease download the 32-bit version from ${WEBSITE}.$\n$\nClick Ok to quit Setup.'
Quit