Module: Mesa Branch: gallium-0.1 Commit: acaf02b69c27a6f30aeb1b2b1b64907e336bceea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=acaf02b69c27a6f30aeb1b2b1b64907e336bceea
Author: José Fonseca <[email protected]> Date: Wed Mar 25 19:32:54 2009 +0000 scons: Move MSVC specific away from Mingw builds. Conflicts: scons/generic.py --- 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 ae4f2d8..500376c 100644 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -227,9 +227,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 2f7791c..e66db44 100644 --- a/scons/generic.py +++ b/scons/generic.py @@ -303,9 +303,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': _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
