diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-09 10:08:06 +0000 |
| commit | e3734593aea202e99e77febea7b86c904080939f (patch) | |
| tree | 69856674e2062c55ec5eec95eb0e31225a943084 /src/mesa/state_tracker/wgl/SConscript | |
| parent | 221352bbd79a0ea92ce31cffb65537f62ee5668e (diff) | |
| parent | 5cad143e545775acacee294049345c6a3868c51d (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/state_tracker/wgl/SConscript')
| -rw-r--r-- | src/mesa/state_tracker/wgl/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/wgl/SConscript b/src/mesa/state_tracker/wgl/SConscript index cceb8264ea..bb579930f5 100644 --- a/src/mesa/state_tracker/wgl/SConscript +++ b/src/mesa/state_tracker/wgl/SConscript @@ -11,8 +11,9 @@ if env['platform'] in ['windows']: ]) env.Append(CPPDEFINES = [ + '_GDI32_', # prevent wgl* being declared __declspec(dllimport) + 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers '__GL_EXPORTS', - 'BUILD_GL32', '_GNU_H_WINDOWS32_DEFINES', ]) |