From 40df19f5e86a371e2ebdaf037810a5c07eff3a14 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 13 Nov 2006 14:10:11 +0000
Subject: [PATCH] * 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         |  7 +++----
 SCons/Config/ms | 18 ++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/INSTALL b/INSTALL
index bba93fa7..6986f400 100644
--- a/INSTALL
+++ b/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.
-     Therefore a temporary workaround has been added to support this
-     compiler. Add TEMP_MSVC2005=yes to the build command line when
-     using MSVC 2005:
+   * When using Microsoft Visual C++ 2005, add TEMP_MSVC2005=yes to
+     the build command line (this temporary workaround will soon be
+     removed):
 
         scons TEMP_MSVC2005=yes PREFIX=C:\NSIS install
 
diff --git a/SCons/Config/ms b/SCons/Config/ms
index 61fe9d64..0e6ff6ed 100644
--- a/SCons/Config/ms
+++ b/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']: