* !AddIncludeDir displays the cpu architecture in the script message if specified as a parameter

* Removed unused SYSTEM_PARTIALCALLSUPPORT define
* Fixed minor typos
* Allow MSVC_USE_SCRIPT to be specified on the commandline or in the environment


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6611 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-18 23:16:34 +00:00
parent d0ddb4aab0
commit 5615d42881
5 changed files with 15 additions and 16 deletions

View file

@ -449,7 +449,7 @@ def DistributeExtras(env, target, examples, docs):
if defenv['MSTOOLKIT']:
if GetOptionOrEnv('MSVC_USE_SCRIPT', '!') != '!':
defenv['MSVC_USE_SCRIPT'] = ARGUMENTS.get('MSVC_USE_SCRIPT')
defenv['MSVC_USE_SCRIPT'] = GetOptionOrEnv('MSVC_USE_SCRIPT')
defenv.Tool('mstoolkit', toolpath = [Dir('SCons/Tools').rdir()])
defenv.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))