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

mstoolkit.py now supports MSVC_USE_SCRIPT=None to import VC and SDK paths from environment variables

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6428 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-01-21 14:21:26 +00:00
parent 52a8b320ef
commit 9b3a98a07f
2 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SCons/Config/ms
View file

@ -1,6 +1,5 @@
print "Using Microsoft tools configuration"
Import('defenv')
print "Using Microsoft tools configuration (%s)" % defenv.get('MSVS_VERSION','<Default>')
### flags
@ -37,7 +36,7 @@ else:
if msvs_version < 10.0:
# not even /ALIGN:512 works for vc10... fails to load process
defenv.Append(LINKFLAGS = ['/opt:nowin98'])
if defenv['MSTOOLKIT']:
if defenv['MSTOOLKIT'] and msvs_version < 8.0:
defenv['MSVCRT_FLAG'] = '/ML' # TK2003 does not have all libs
### defines