Scons: libintl also needs /MD option

[features.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 84dae97231d3aecaf5c508a95e590a7e68e36fac..298d0ce7f863e283c513c012980d8fdfc9d0ef62 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -468,7 +468,13 @@ if use_vc:
     #   in the current code page (number)
     # C4996: foo was decleared deprecated
     CCFLAGS_required.extend(['/TP', '/EHsc'])
-    CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
+    if mode == 'debug':
+        CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
+        # the flags are also needed in C mode (for intl lib)
+        C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
+    else:
+        CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
+        C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
 else:
     if env.has_key('CXX') and env['CXX']:
         env['CC'] = env.subst('$CXX')