From a68ba5e0f099e54cf16b6e33a0fc0a8db7455eed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Mon, 29 Aug 2011 13:28:41 +0100 Subject: [PATCH] libgl-gdi: Fix mingw-w64 build. Mingw-w64 actually seems to be closer to MSVC in terms of .DEF parsing. --- src/gallium/targets/libgl-gdi/SConscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 49462a8..f6c8e8d 100644 --- 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'] -- 2.7.4