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

* SCons 0.96.93 automatically detects MSVC 2005, using environment variables is no longer needed

Browse source 
* Use new exception flag for MSVC 2005


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4814 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2006-11-13 14:10:11 +00:00
parent 4bdb1ebd7d
commit 40df19f5e8
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
SCons/Config/ms
View file

@ -2,28 +2,22 @@ print "Using Microsoft tools configuration"
Import('defenv')
### workaround for MSVC 2005 support
import os
if defenv['TEMP_MSVC2005']:
defenv['ENV']['PATH'] = os.environ.get('PATH')
defenv['ENV']['HOME'] = os.environ.get('HOME')
defenv['ENV']['LIB'] = os.environ.get('LIB')
defenv['ENV']['INCLUDE'] = os.environ.get('INCLUDE')
defenv.Append(CCFLAGS = '/GS-')
### flags
defenv['ENTRY_FLAG'] = lambda x: '/entry:' + x
defenv['MAP_FLAG'] = '/map'
defenv['EXCEPTION_FLAG'] = '/GX'
defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB'
defenv['C_FLAG'] = '/TC'
defenv['CPP_FLAG'] = '/TP'
defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '/subsystem:console'
if defenv['TEMP_MSVC2005']:
defenv['EXCEPTION_FLAG'] = '/EHsc'
defenv.Append(CCFLAGS = '/GS-')
else:
defenv['EXCEPTION_FLAG'] = '/GX'
### debug
if defenv['DEBUG']: