aboutsummaryrefslogtreecommitdiff
path: root/qemu.nsi
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-09-28 10:34:30 +0200
committerStefan Weil <sw@weilnetz.de>2013-11-07 07:02:44 +0100
commit40b9cc5e40ca69c15a2243852fa20fd1a35a0ea6 (patch)
treea0ba9bbdeb031f43d7507db2392bc99a56fd5948 /qemu.nsi
parent964668b03d26f0b5baa5e5aff0c966f4fcb76e9e (diff)
downloadqemu-arm-40b9cc5e40ca69c15a2243852fa20fd1a35a0ea6.tar.gz
nsis: Improved support for parallel installation of 32 and 64 bit code
32 and 64 bit variants of QEMU already had different default installation directories, but used a common registry key for saving the choosen directory. This is confusing for users who want to install both variants, so fix it by using different registry keys. Signed-off-by: Stefan Weil <sw@weilnetz.de>
Diffstat (limited to 'qemu.nsi')
-rw-r--r--qemu.nsi6
1 files changed, 5 insertions, 1 deletions
diff --git a/qemu.nsi b/qemu.nsi
index 0dc1f52693..cc5fafd579 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -60,7 +60,11 @@ InstallDir $PROGRAMFILES\qemu
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\qemu" "Install_Dir"
+!ifdef W64
+InstallDirRegKey HKLM "Software\qemu64" "Install_Dir"
+!else
+InstallDirRegKey HKLM "Software\qemu32" "Install_Dir"
+!endif
; Request administrator privileges for Windows Vista.
RequestExecutionLevel admin