scons: Choose the appropriate MSVC CRT.

diff --git a/scons/gallium.py b/scons/gallium.py
index 19eeb18be85259395ae5399debfca534d9ea108e..33bd65dd54366364689dbbe3db427ca5f08d5428 100644 (file)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -390,6 +390,16 @@ def generate(env):
     env.Append(CFLAGS = cflags)
     env.Append(CXXFLAGS = cflags)
 
+    if env['platform'] == 'windows' and msvc:
+        # Choose the appropriate MSVC CRT
+        # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
+        if env['debug']:
+            env.Append(CCFLAGS = ['/MTd'])
+            env.Append(SHCCFLAGS = ['/LDd'])
+        else:
+            env.Append(CCFLAGS = ['/MT'])
+            env.Append(SHCCFLAGS = ['/LD'])
+    
     # Assembler options
     if gcc:
         if env['machine'] == 'x86':

diff --git a/scons/generic.py b/scons/generic.py
index f0bb3de9fcd43ac410b3b9b20408d6c3e21bbda0..0ed21a4e6ce13ed5e3db47ef01860ac3e349dd3e 100644 (file)
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -458,6 +458,16 @@ def generate(env):
     env.Append(CFLAGS = cflags)
     env.Append(CXXFLAGS = cflags)
 
+    if env['platform'] == 'windows' and msvc:
+        # Choose the appropriate MSVC CRT
+        # http://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
+        if env['debug']:
+            env.Append(CCFLAGS = ['/MTd'])
+            env.Append(SHCCFLAGS = ['/LDd'])
+        else:
+            env.Append(CCFLAGS = ['/MT'])
+            env.Append(SHCCFLAGS = ['/LD'])
+    
     # Assembler options
     if gcc:
         if env['machine'] == 'x86':