From 7e9f5eab4e18e0b661fc9b65a0f409d10e041b24 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Fri, 5 Nov 2010 18:18:09 +0000 Subject: scons: Move dependancy checks to the main gallium scons file --- src/gallium/SConscript | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/gallium/SConscript') 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 -- cgit v1.2.3