summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-12-31 20:19:18 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-01 12:16:19 +0000
commit3d747eded475b227cc025391d0438a5dd1357cb9 (patch)
treea28aa33f87abddc093684d28a92a90563eb9e17b
parent33f44b93d26a1d0c2c15a2613b07510825bc1d54 (diff)
scons: Don't globally define WIN32_LEAN_AND_MEAN.
Some of the demo progams legitimately need the functionality that's disabled by WIN32_LEAN_AND_MEAN. Instead the solution should be to define WIN32_LEAN_AND_MEAN just before including windows.h on a case by case basis.
-rw-r--r--scons/gallium.py2
-rw-r--r--scons/generic.py2
-rw-r--r--src/gallium/state_trackers/wgl/SConscript3
3 files changed, 2 insertions, 5 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 61334f71c7..f24959c120 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -153,8 +153,6 @@ def generate(env):
#'UNICODE',
('_WIN32_WINNT', '0x0501'), # minimum required OS version
('WINVER', '0x0501'),
- # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx,
- 'WIN32_LEAN_AND_MEAN',
]
if msvc and env['toolchain'] != 'winddk':
cppdefines += [
diff --git a/scons/generic.py b/scons/generic.py
index 208e3b6526..149256c3db 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -228,8 +228,6 @@ def generate(env):
'_WINDOWS',
#'_UNICODE',
#'UNICODE',
- # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx,
- #'WIN32_LEAN_AND_MEAN',
]
if msvc:
cppdefines += [
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index b05944a33b..352c087475 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -11,10 +11,11 @@ if env['platform'] in ['windows']:
'.',
])
- env.Append(CPPDEFINES = [
+ env.AppendUnique(CPPDEFINES = [
'_GDI32_', # prevent wgl* being declared __declspec(dllimport)
'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
'WIN32_THREADS', # use Win32 thread API
+ 'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
])
sources = [