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

Include CPU architecture in the RegTool filename so Library.nsh always picks the correct version

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6859 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-05-14 16:16:30 +00:00
parent d80b364e1d
commit ce7078517f
7 changed files with 25 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Library/RegTool/RegTool.cpp
View file

@ -49,7 +49,7 @@ template<class T> BOOL CreateProcess(const T*p1,const T*p2,LPSECURITY_ATTRIBUTES
static bool IsWinNT()
{
#ifdef _WIN64
#if defined(_WIN64) || (defined(_M_ARM) || defined(__arm__))
return true;
#else
LPCWSTR str = L"count"; // Using this string because it's already used in other parts of the code

6
Contrib/Library/RegTool/SConscript
View file

@ -12,6 +12,8 @@ libs = Split("""
ole32
""")
Import('BuildUtil')
Import('BuildUtil env GetArcCPU')
BuildUtil(target, files, libs, entry = 'NSISWinMainNOCRT', nodeflib = True, file_name = 'RegTool.bin')
filename = 'RegTool-' + GetArcCPU(env) + '.bin'
BuildUtil(target, files, libs, entry = 'NSISWinMainNOCRT', nodeflib = True, file_name = filename)