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

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

Reported-by: Mat <mberchtold@gmail.com>
Based-on-patch-by: Mat <mberchtold@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2016-10-23 13:16:31 +03:00
parent 9e8c2466a4
commit a1461a5a89

View File

@ -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