From f03e32fc2fce55e0c5381c76576a224c4114c6db Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 27 Nov 2006 14:38:16 +0000
Subject: [PATCH] MSVC_VERSION has `Exp` prefix for express versions

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4825 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Math/SConscript | 2 +-
 SCons/Config/ms         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Contrib/Math/SConscript b/Contrib/Math/SConscript
index 5b6b306b..b1ea36b1 100644
--- a/Contrib/Math/SConscript
+++ b/Contrib/Math/SConscript
@@ -23,7 +23,7 @@ docs = Split("""
 
 Import('BuildPlugin env')
 
-if float(env['MSVS_VERSION']) >= 8.0:
+if float(env['MSVS_VERSION'].replace('Exp','')) >= 8.0:
 	files += ['Source/mathcrtmt.lib']
 else:
 	files += ['Source/mathcrt.lib']
diff --git a/SCons/Config/ms b/SCons/Config/ms
index e71b07fb..35e9f546 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -12,7 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
 defenv['CPP_REQUIRES_STDLIB'] = 0
 defenv['SUBSYS_CON'] = '/subsystem:console'
 
-if float(defenv['MSVS_VERSION']) >= 8.0:
+if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
 	defenv['EXCEPTION_FLAG'] = '/EHsc'
 	defenv.Append(CCFLAGS = '/GS-')
 else: