diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-02-19 10:57:11 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-02-19 10:59:13 +0000 |
| commit | 65fde5be8bd5e485dd69afc244568f164cf24fa4 (patch) | |
| tree | 99633d37fa10553e650fd325a9bad5cf434b5d32 /src/gallium/winsys/gdi | |
| parent | d32ae764e930abb70ca2cc79ad18fdb32141ca0d (diff) | |
wgl: Use a separate .DEF for MinGW
gnu linker fails to resolve the @n symbols, unless:
- they are listed verbatim in the .def
- they are already linked.
And mingw's .def parser is slightly incompatible with MSVC in respect with
underscores. Will try to work with upstream to fix this, but for now there
is no option other to use seperate .def for mingw.
Diffstat (limited to 'src/gallium/winsys/gdi')
| -rw-r--r-- | src/gallium/winsys/gdi/SConscript | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript index f9c1a34668..72b5df8ca2 100644 --- a/src/gallium/winsys/gdi/SConscript +++ b/src/gallium/winsys/gdi/SConscript @@ -11,12 +11,6 @@ if env['platform'] == 'windows': '#src/gallium/state_trackers/wgl', ]) - env.Append(CPPDEFINES = [ - '__GL_EXPORTS', - 'BUILD_GL32', - '_GNU_H_WINDOWS32_DEFINES', - ]) - env.Append(LIBS = [ 'gdi32', 'user32', @@ -24,9 +18,13 @@ if env['platform'] == 'windows': ]) sources = [ - '#src/gallium/state_trackers/wgl/opengl32.def', 'gdi_softpipe_winsys.c', ] + + if env['toolchain'] == 'crossmingw': + sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def'] + else: + sources += ['#src/gallium/state_trackers/wgl/opengl32.def'] drivers = [ softpipe, |