Mesa (gallium-0.2): scons: Don't hardcode any drivers for the xlib winsys, just pick suitable ones.
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Oct 23 08:29:34 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: 06c43beee08052bae3832586559889d74fb538b6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06c43beee08052bae3832586559889d74fb538b6
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Oct 23 10:27:39 2008 +0200
scons: Don't hardcode any drivers for the xlib winsys, just pick suitable ones.
---
src/gallium/winsys/xlib/SConscript | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 324fbef..3aef3b6 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -5,8 +5,7 @@ Import('*')
if env['platform'] == 'linux' \
and 'mesa' in env['statetrackers'] \
- and 'softpipe' in env['drivers'] \
- and 'i965simple' in env['drivers'] \
+ and ('softpipe' or 'i915simple' or 'trace') in env['drivers'] \
and not env['dri']:
env = env.Clone()
@@ -22,15 +21,20 @@ if env['platform'] == 'linux' \
'xfonts.c',
'xm_api.c',
'xm_winsys.c',
- 'xm_winsys_aub.c',
- 'brw_aub.c',
]
+
+ drivers = [];
+
+ if 'softpipe' in env['drivers']:
+ drivers += [softpipe]
+
+ if 'i965simple' in env['drivers']:
+ drivers += [i965simple]
+ sources += [
+ 'brw_aub.c',
+ 'xm_winsys_aub.c',
+ ]
- drivers = [
- softpipe,
- i965simple,
- ]
-
if 'trace' in env['drivers']:
env.Append(CPPDEFINES = 'GALLIUM_TRACE')
drivers += [trace]
More information about the mesa-commit
mailing list