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

* 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

INSTALL

@@ -32,10 +32,9 @@ This is a trimmed version of Appendix "Building NSIS" of the documentation.
 
  - Special cases
 
-   * SCons 0.96.93 does not yet support Microsoft Visual C++ 2005.
+   * When using Microsoft Visual C++ 2005, add TEMP_MSVC2005=yes to
-     Therefore a temporary workaround has been added to support this
+     the build command line (this temporary workaround will soon be
-     compiler. Add TEMP_MSVC2005=yes to the build command line when
+     removed):
-     using MSVC 2005:
 
         scons TEMP_MSVC2005=yes PREFIX=C:\NSIS install
 

SCons/Config/ms

@@ -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']: