summaryrefslogtreecommitdiff
path: root/src/gallium/SConscript
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-11-05 18:18:09 +0000
committerJakob Bornecrantz <jakob@vmware.com>2010-11-05 20:58:49 +0000
commit7e9f5eab4e18e0b661fc9b65a0f409d10e041b24 (patch)
tree2dcac3d4993bf9d33815821c9c752f3fa1ce1e8d /src/gallium/SConscript
parentc0db7854d502d0b24110cbe8560967794d7938cb (diff)
scons: Move dependancy checks to the main gallium scons file
Diffstat (limited to 'src/gallium/SConscript')
-rw-r--r--src/gallium/SConscript18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9436b684e4..207987bedc 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -54,14 +54,22 @@ SConscript('winsys/sw/null/SConscript')
SConscript('state_trackers/python/SConscript')
if env['platform'] != 'embedded':
- SConscript('state_trackers/glx/xlib/SConscript')
- SConscript('state_trackers/dri/SConscript')
- SConscript('state_trackers/xorg/SConscript')
- SConscript('state_trackers/egl/SConscript')
SConscript('state_trackers/vega/SConscript')
+ if env['x11']:
+ SConscript('state_trackers/glx/xlib/SConscript')
+
+ if env['dri']:
+ SConscript('state_trackers/dri/SConscript')
+
+ if env['dri'] and env['xorg']:
+ SConscript('state_trackers/xorg/SConscript')
+
if env['platform'] == 'windows':
- SConscript('state_trackers/wgl/SConscript')
+ SConscript([
+ 'state_trackers/egl/SConscript',
+ 'state_trackers/wgl/SConscript',
+ ])
#
# Winsys