diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-10-23 13:16:31 +0300 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2016-10-23 16:27:48 +0300 |
| commit | a1461a5a89811dec60defcdb64dd2980cd45d877 (patch) | |
| tree | ef48b70a8ab5faaf45bc2bae1cec1dc6039c71e9 /nsis | |
| parent | 9e8c2466a4eaa3de7d25ea46257ba9b0af45b671 (diff) | |
| download | nasm-a1461a5a89811dec60defcdb64dd2980cd45d877.tar.gz | |
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>
Diffstat (limited to 'nsis')
| -rw-r--r-- | nsis/nasm.nsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nsis/nasm.nsi b/nsis/nasm.nsi index ebb8ef9a..a021bd55 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 |