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

* Added IsWow64 to x64.nsh and fixed RunningX64 for 64-bit installers.

Browse source 
* NSIS_AMD64 and NSIS_IX86 defines added for CPU target detection



git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6538 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-08-15 20:25:18 +00:00
parent 3c2a937cab
commit 7ae2e8f84f
4 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/build.cpp
View file

@ -3767,6 +3767,13 @@ int CEXEBuild::set_target_architecture_data()
}
definedlist.set(_T("NSIS_PTR_SIZE"), is_target_64bit() ? _T("8") : _T("4"));
definedlist.del(_T("NSIS_IX86"));
definedlist.del(_T("NSIS_AMD64"));
if (TARGET_AMD64 == m_target_type)
definedlist.set(_T("NSIS_AMD64"));
else
definedlist.set(_T("NSIS_IX86"), build_unicode ? _T("400") : _T("300"));
return PS_OK;
}