diff --git a/Docs/src/history.but b/Docs/src/history.but index b5a4ed66..cf04915f 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -12,6 +12,8 @@ Released on ??? ??th, 20?? \b MakeNSIS prints -CMDHELP to stdout (\W{http://sf.net/p/nsis/bugs/1203}{bug #1203}) +\b Added IsNativeProcessorArchitecture helper macros to x64.nsh + \S2{} Translations \b Fixed minor Spanish bug (\W{http://sf.net/p/nsis/bugs/1205}{bug #1205}) diff --git a/Include/x64.nsh b/Include/x64.nsh index eeddca8e..ed626319 100644 --- a/Include/x64.nsh +++ b/Include/x64.nsh @@ -63,6 +63,16 @@ !endif !macroend +!define IsNativeProcessorArchitecture `"" IsNativeProcessorArchitecture ` +!macro _IsNativeProcessorArchitecture _ignore _arc _t _f + !insertmacro _LOGICLIB_TEMP + ${GetNativeProcessorArchitecture} $_LOGICLIB_TEMP + !insertmacro _= $_LOGICLIB_TEMP ${_arc} `${_t}` `${_f}` +!macroend +!define IsNativeProcessorArchitectureIA32 '${IsNativeProcessorArchitecture} 0' ; Intel x86 +!define IsNativeProcessorArchitectureAMD64 '${IsNativeProcessorArchitecture} 9' ; x86-64/x64 +!define IsNativeProcessorArchitectureARM64 '${IsNativeProcessorArchitecture} 12' + !define DisableX64FSRedirection "!insertmacro DisableX64FSRedirection" !macro DisableX64FSRedirection