projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec759b3)
libgl-gdi: Fix mingw-w64 build.
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Mon, 29 Aug 2011 12:28:41 +0000 (13:28 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Tue, 30 Aug 2011 08:42:01 +0000 (09:42 +0100)
Mingw-w64 actually seems to be closer to MSVC in terms of .DEF parsing.

src/gallium/targets/libgl-gdi/SConscript patch | blob | history

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 49462a8e309cf4235fdae2035f799579770c3cb9..f6c8e8de78e80d2de45e4e18b761b4b98f370ea9 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -27,7 +27,9 @@ if env['llvm']:
     env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
     drivers += [llvmpipe]
 
-if env['gcc']:
+if env['gcc'] and 'w64' not in env['CC'].split('-'):
+    # DEF parser in certain versions of MinGW is busted, as does not behave as
+    # MSVC.  mingw-w64 works fine.
     sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
 else:
     sources += ['#src/gallium/state_trackers/wgl/opengl32.def']