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

automatic MSVC 2005 detection

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4816 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2006-11-14 19:14:53 +00:00
parent 62776e907d
commit f04bd2fa14
5 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SCons/Config/ms
View file

@ -12,7 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '/subsystem:console'
if defenv['TEMP_MSVC2005']:
if defenv['MSVS_VERSION'] >= 8.0:
defenv['EXCEPTION_FLAG'] = '/EHsc'
defenv.Append(CCFLAGS = '/GS-')
else:
@ -31,7 +31,7 @@ if defenv['DEBUG']:
# if stl usage causes link failure, copy the good libcp.lib
# from one of the other lib folders and use it instead.
if not defenv['TEMP_MSVC2005']:
if not defenv['MSVS_VERSION'] >= 8.0:
confenv = defenv.Clone()
conf = confenv.Configure()
@ -87,7 +87,7 @@ makensis_env = defenv.Clone()
if not defenv['DEBUG']:
makensis_env.Append(CCFLAGS = '/O2') # optimize for speed
makensis_env.Append(CCFLAGS = '/GX') # enable exceptions
makensis_env.Append(CCFLAGS = '$EXCEPTION_FLAG') # enable exceptions
makensis_env.Append(CCFLAGS = '/W3') # level 3 warnings
makensis_env.Append(LINKFLAGS = '/opt:nowin98') # 512 bytes align