Mesa (master): scons: Move MSVC specific away from Mingw builds.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Mar 25 21:02:00 UTC 2009


Module: Mesa
Branch: master
Commit: b3e03ede3eeb224a2c293ae924ffa58f1de7e84a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3e03ede3eeb224a2c293ae924ffa58f1de7e84a

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Mar 25 19:32:54 2009 +0000

scons: Move MSVC specific away from Mingw builds.

---

 scons/gallium.py |    7 +++++--
 scons/generic.py |    7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index ed4f49c..e2cd054 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -251,9 +251,12 @@ def generate(env):
             ('WINVER', '0x0501'),
             # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx,
             'WIN32_LEAN_AND_MEAN',
-            'VC_EXTRALEAN',
-            '_CRT_SECURE_NO_DEPRECATE',
         ]
+        if msvc:
+            cppdefines += [
+                'VC_EXTRALEAN',
+                '_CRT_SECURE_NO_DEPRECATE',
+            ]
         if debug:
             cppdefines += ['_DEBUG']
     if platform == 'winddk':
diff --git a/scons/generic.py b/scons/generic.py
index 764b626..03563e4 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -331,9 +331,12 @@ def generate(env):
             #'UNICODE',
             # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx,
             #'WIN32_LEAN_AND_MEAN',
-            'VC_EXTRALEAN',
-            '_CRT_SECURE_NO_DEPRECATE',
         ]
+        if msvc:
+            cppdefines += [
+                'VC_EXTRALEAN',
+                '_CRT_SECURE_NO_DEPRECATE',
+            ]
         if debug:
             cppdefines += ['_DEBUG']
     if platform == 'winddk':




More information about the mesa-commit mailing list