[nasm:master] nsis: Use Program Files (x86) directory for nasm installation on x86-64

[nasm-bot f. C. G. <gor...@gm...>]

Commit-ID:  a1461a5a89811dec60defcdb64dd2980cd45d877
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=a1461a5a89811dec60defcdb64dd2980cd45d877
Author:     Cyrill Gorcunov <gor...@gm...>
AuthorDate: Sun, 23 Oct 2016 13:16:31 +0300
Committer:  Cyrill Gorcunov <gor...@gm...>
CommitDate: Sun, 23 Oct 2016 16:27:48 +0300

nsis: Use Program Files (x86) directory for nasm installation on x86-64

https://bugzilla.nasm.us/show_bug.cgi?id=3392365

Reported-by: Mat <mbe...@gm...>
Based-on-patch-by: Mat <mbe...@gm...>
Signed-off-by: Cyrill Gorcunov <gor...@gm...>


---
 nsis/nasm.nsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nsis/nasm.nsi b/nsis/nasm.nsi
index ebb8ef9..a021bd5 100644
--- a/nsis/nasm.nsi
+++ b/nsis/nasm.nsi
@@ -30,6 +30,7 @@
 !addincludedir "${srcdir}/nsis"
 !include "version.nsh"
 !include /nonfatal "arch.nsh"
+!include /nonfatal "x64.nsh"
 
 !define PRODUCT_NAME "Netwide Assembler"
 !define PRODUCT_SHORT_NAME "nasm"
@@ -229,6 +230,13 @@ SectionEnd
 ; MUI requires this hooks
 Function .onInit
     !insertmacro MULTIUSER_INIT
+    ${If} ${RunningX64}
+        SetRegView 64
+	${EnableX64FSRedirection}
+        StrCpy $INSTDIR "$PROGRAMFILES64\${PRODUCT_SHORT_NAME}"
+    ${Else}
+        StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_SHORT_NAME}"
+    ${EndIf}
 FunctionEnd
 
 Function un.onInit