From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 6 Jan 2009 16:16:38 +0000 (+0000)
Subject: scons: Choose the appropriate MSVC CRT.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1781d7fa3880ffb6d3062414704fb4d29e9297ad;p=mesa.git

scons: Choose the appropriate MSVC CRT.
---

diff --git a/scons/gallium.py b/scons/gallium.py
index 92cafa27e0c..3d5a0532eca 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -392,6 +392,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 f0bb3de9fcd..0ed21a4e6ce 100644
--- 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':