scons: Move dependancy checks to the main gallium scons file
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9436b68..207987b 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -54,14 +54,22 @@
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