Mesa (gallium-mesa-7.4): xlib: Fix scons conditional compilation logic.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Mon May 25 14:57:17 UTC 2009


Module: Mesa
Branch: gallium-mesa-7.4
Commit: 3f6fc98cc39c973b110352d1083608e716648c77
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f6fc98cc39c973b110352d1083608e716648c77

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun May 24 10:29:44 2009 -0700

xlib: Fix scons conditional compilation logic.

---

 src/gallium/drivers/trace/README   |    2 +-
 src/gallium/winsys/xlib/SConscript |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/trace/README b/src/gallium/drivers/trace/README
index 73dce20..a040000 100644
--- a/src/gallium/drivers/trace/README
+++ b/src/gallium/drivers/trace/README
@@ -10,7 +10,7 @@ This directory contains a Gallium3D pipe driver which traces all incoming calls.
 
 To build, invoke scons on the top dir as
  
- scons dri=no statetrackers=mesa drivers=softpipe,i965simple,trace winsys=xlib
+ scons debug=yes statetrackers=mesa drivers=softpipe,trace winsys=xlib dri=no
 
 
 = Usage =
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 0fb4b50..76e80dc 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -5,7 +5,7 @@ Import('*')
 
 if env['platform'] == 'linux' \
         and 'mesa' in env['statetrackers'] \
-        and ('softpipe' or 'i915simple' or 'trace') in env['drivers'] \
+        and set(['softpipe', 'i965simple', 'cell']).intersection(env['drivers']) \
         and not env['dri']:
 
     env = env.Clone()




More information about the mesa-commit mailing list