diff options
| author | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
| commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
| tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/gallium/winsys | |
| parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
| parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/gdi/SConscript | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript index cc6aa6634fd..b463fa6505d 100644 --- a/src/gallium/winsys/gdi/SConscript +++ b/src/gallium/winsys/gdi/SConscript @@ -14,12 +14,6 @@ if env['platform'] == 'windows': env.Append(CPPDEFINES = [ ]) - env.Append(CPPDEFINES = [ - '__GL_EXPORTS', - 'BUILD_GL32', - '_GNU_H_WINDOWS32_DEFINES', - ]) - sources = [ '#src/mesa/state_tracker/wgl/opengl32.def', 'gdi_softpipe_winsys.c', |