From b293ebb2290337d3acc0f51918169bb43db9e6ba Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 2 Mar 2007 11:17:08 +0000
Subject: [PATCH] added MSVCRT_FLAG

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4963 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/NSIS Menu/SConscript | 2 +-
 SCons/Config/default         | 1 +
 SCons/Config/gnu             | 1 +
 SCons/Config/ms              | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Contrib/NSIS Menu/SConscript b/Contrib/NSIS Menu/SConscript
index ac2a5e2b..0560d24b 100644
--- a/Contrib/NSIS Menu/SConscript	
+++ b/Contrib/NSIS Menu/SConscript	
@@ -63,7 +63,7 @@ if os.environ.has_key('WXWIN'):
 		libs,
 		res = rc,
 		resources = resources,
-		flags = ['/MD', '$EXCEPTION_FLAG'],
+		flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
 		libpath = wxlib,
 		incpath = wxinc,
 		root_util = True
diff --git a/SCons/Config/default b/SCons/Config/default
index da543e7e..709ab3b9 100644
--- a/SCons/Config/default
+++ b/SCons/Config/default
@@ -12,6 +12,7 @@ defenv['C_FLAG'] = ''
 defenv['CPP_FLAG'] = ''
 defenv['CPP_REQUIRES_STDLIB'] = 0
 defenv['SUBSYS_CON'] = ''
+defenv['MSVCRT_FLAG'] = ''
 
 ### stub environment
 
diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index dd0dec24..843c10f2 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -30,6 +30,7 @@ defenv['CPP_FLAG'] = '-x c++'
 defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
 defenv['CPP_REQUIRES_STDLIB'] = 1
 defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
+defenv['MSVCRT_FLAG'] = ''
 
 ### helper functions
 
diff --git a/SCons/Config/ms b/SCons/Config/ms
index 1a17b7d6..a0dc81eb 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -11,6 +11,7 @@ defenv['C_FLAG'] = '/TC'
 defenv['CPP_FLAG'] = '/TP'
 defenv['CPP_REQUIRES_STDLIB'] = 0
 defenv['SUBSYS_CON'] = '/subsystem:console'
+defenv['MSVCRT_FLAG'] = '/MD'
 
 if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
 	defenv['EXCEPTION_FLAG'] = '/EHsc'