Mesa (master): libgl-gdi: Mingw-w64 in 32bit mode matches the Mingw32's . DEF semantics.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Nov 3 09:59:36 UTC 2011


Module: Mesa
Branch: master
Commit: 3276c3d42b64b4feffe9293bbc63e161b1e522d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3276c3d42b64b4feffe9293bbc63e161b1e522d7

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Nov  3 09:38:43 2011 +0000

libgl-gdi: Mingw-w64 in 32bit mode matches the Mingw32's .DEF semantics.

---

 src/gallium/targets/libgl-gdi/SConscript |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index f6c8e8d..f8393da 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -27,7 +27,7 @@ if env['llvm']:
     env.Append(CPPDEFINES = 'HAVE_LLVMPIPE')
     drivers += [llvmpipe]
 
-if env['gcc'] and 'w64' not in env['CC'].split('-'):
+if env['gcc'] and env['machine'] != 'x86_64':
     # 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']




More information about the mesa-commit mailing list