diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 21:17:13 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 21:17:13 -0700 |
commit | 3d823faeead22e03d38930dcf59e64c183412268 (patch) | |
tree | 6c007bf5794cc5c4ff11007a85c723b873bd73e8 /nsis | |
parent | 704d9b151d5426807f425cbdcf3369024c7c6425 (diff) | |
download | nasm-3d823faeead22e03d38930dcf59e64c183412268.tar.gz |
nsis: finally figure out how to get the proper install directory stuff...
I had fixed MultiUser.nsh, but it turns out that the builtin version
has higher priority, so we kept picking that one up...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'nsis')
-rwxr-xr-x | nsis/NASMMultiUser.nsh (renamed from nsis/MultiUser.nsh) | 0 | ||||
-rw-r--r-- | nsis/nasm.nsi | 13 | ||||
-rw-r--r-- | nsis/x64.nsh | 54 |
3 files changed, 3 insertions, 64 deletions
diff --git a/nsis/MultiUser.nsh b/nsis/NASMMultiUser.nsh index a04048ab..a04048ab 100755 --- a/nsis/MultiUser.nsh +++ b/nsis/NASMMultiUser.nsh diff --git a/nsis/nasm.nsi b/nsis/nasm.nsi index 871f23a9..3d790435 100644 --- a/nsis/nasm.nsi +++ b/nsis/nasm.nsi @@ -29,8 +29,7 @@ !addincludedir "${objdir}\nsis" !addincludedir "${srcdir}\nsis" !include "version.nsh" -!include /nonfatal "arch.nsh" -!include /nonfatal "x64.nsh" +!include "arch.nsh" !define PRODUCT_NAME "Netwide Assembler" !define PRODUCT_SHORT_NAME "nasm" @@ -43,7 +42,7 @@ SetCompressor lzma !define MULTIUSER_MUI !define MULTIUSER_INSTALLMODE_COMMANDLINE !define MULTIUSER_INSTALLMODE_INSTDIR "NASM" -!include "MultiUser.nsh" +!include "NASMMultiUser.nsh" !insertmacro MULTIUSER_PAGE_INSTALLMODE !insertmacro MULTIUSER_INSTALLMODEPAGE_INTERFACE @@ -229,14 +228,8 @@ SectionEnd ; ; MUI requires this hooks Function .onInit + SetRegView ${BITS} !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 diff --git a/nsis/x64.nsh b/nsis/x64.nsh deleted file mode 100644 index e694c1e6..00000000 --- a/nsis/x64.nsh +++ /dev/null @@ -1,54 +0,0 @@ -; --------------------- -; x64.nsh -; --------------------- -; -; A few simple macros to handle installations on x64 machines. -; -; RunningX64 checks if the installer is running on x64. -; -; ${If} ${RunningX64} -; MessageBox MB_OK "running on x64" -; ${EndIf} -; -; DisableX64FSRedirection disables file system redirection. -; EnableX64FSRedirection enables file system redirection. -; -; SetOutPath $SYSDIR -; ${DisableX64FSRedirection} -; File some.dll # extracts to C:\Windows\System32 -; ${EnableX64FSRedirection} -; File some.dll # extracts to C:\Windows\SysWOW64 -; - -!ifndef ___X64__NSH___ -!define ___X64__NSH___ - -!include LogicLib.nsh - -!macro _RunningX64 _a _b _t _f - !insertmacro _LOGICLIB_TEMP - System::Call kernel32::GetCurrentProcess()i.s - System::Call kernel32::IsWow64Process(is,*i.s) - Pop $_LOGICLIB_TEMP - !insertmacro _!= $_LOGICLIB_TEMP 0 `${_t}` `${_f}` -!macroend - -!define RunningX64 `"" RunningX64 ""` - -!macro DisableX64FSRedirection - - System::Call kernel32::Wow64EnableWow64FsRedirection(i0) - -!macroend - -!define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection" - -!macro EnableX64FSRedirection - - System::Call kernel32::Wow64EnableWow64FsRedirection(i1) - -!macroend - -!define EnableX64FSRedirection "!insertmacro EnableX64FSRedirection" - -!endif # !___X64__NSH___ |