dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Renamed IsNativeProcessorArchitecture helpers

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6990 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-04-09 21:34:50 +00:00
parent 8260047db4
commit cde6d5500f
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Include/x64.nsh
View file

@ -8,7 +8,19 @@
; IsWow64 checks if the installer is a 32-bit application running on a 64-bit OS. ; IsWow64 checks if the installer is a 32-bit application running on a 64-bit OS.
; ;
; ${If} ${RunningX64} ; ${If} ${RunningX64}
; MessageBox MB_OK "running on x64" ; MessageBox MB_OK "Running on 64-bit Windows"
; ${EndIf}
;
; IsNative* checks the OS native CPU architecture.
;
; ${If} ${IsNativeAMD64}
; ; Install AMD64 64-bit driver/library
; ${ElseIf} ${IsNativeARM64}
; ; Install ARM64 64-bit driver/library
; ${ElseIf} ${IsNativeIA32}
; ; Install i386 32-bit driver/library
; ${Else}
; Abort "Unsupported CPU architecture!"
; ${EndIf} ; ${EndIf}
; ;
; DisableX64FSRedirection disables file system redirection. ; DisableX64FSRedirection disables file system redirection.
@ -16,9 +28,9 @@
; ;
; SetOutPath $SYSDIR ; SetOutPath $SYSDIR
; ${DisableX64FSRedirection} ; ${DisableX64FSRedirection}
; File some.dll # extracts to C:\Windows\System32 ; File something.bin # extracts to C:\Windows\System32
; ${EnableX64FSRedirection} ; ${EnableX64FSRedirection}
; File some.dll # extracts to C:\Windows\SysWOW64 ; File something.bin # extracts to C:\Windows\SysWOW64
; ;
!ifndef ___X64__NSH___ !ifndef ___X64__NSH___
@ -69,9 +81,9 @@
${GetNativeProcessorArchitecture} $_LOGICLIB_TEMP ${GetNativeProcessorArchitecture} $_LOGICLIB_TEMP
!insertmacro _= $_LOGICLIB_TEMP ${_arc} `${_t}` `${_f}` !insertmacro _= $_LOGICLIB_TEMP ${_arc} `${_t}` `${_f}`
!macroend !macroend
!define IsNativeProcessorArchitectureIA32 '${IsNativeProcessorArchitecture} 0' ; Intel x86 !define IsNativeIA32 '${IsNativeProcessorArchitecture} 0' ; Intel x86
!define IsNativeProcessorArchitectureAMD64 '${IsNativeProcessorArchitecture} 9' ; x86-64/x64 !define IsNativeAMD64 '${IsNativeProcessorArchitecture} 9' ; x86-64/x64
!define IsNativeProcessorArchitectureARM64 '${IsNativeProcessorArchitecture} 12' !define IsNativeARM64 '${IsNativeProcessorArchitecture} 12'
!define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection" !define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection"