diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
| commit | 4af0d940a35536f096a9289470af0268a79402b3 (patch) | |
| tree | 811a00ed03b1bcd5a99713108f831b41484153ff /src/gallium/winsys | |
| parent | c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2 (diff) | |
| parent | 55839ae064d64b7fcc180fcddb364bf31ab760dc (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/gdi/SConscript | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript index b463fa6505..cc6aa6634f 100644 --- a/src/gallium/winsys/gdi/SConscript +++ b/src/gallium/winsys/gdi/SConscript @@ -14,6 +14,12 @@ 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', |