2 files changed, 5 insertions, 13 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 210fd7d3096..fa4833cbcf6 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,3 +1,5 @@
+import os
+
 Import('*')
 
 env = env.Clone()
@@ -20,15 +22,5 @@ SConscript([
 if llvm:
 	SConscript(['auxiliary/gallivm/SConscript'])
 
-SConscript([
-	'drivers/softpipe/SConscript',
-	'drivers/i915simple/SConscript',
-	'drivers/failover/SConscript',
-])
-
-if not msvc:
-	SConscript(['drivers/i965simple/SConscript'])
-
-#if cell:
-#	SConscript(['drivers/cell/SConscript'])
-	
-\ No newline at end of file
+for driver in env['drivers']:
+	SConscript(os.path.join('drivers', driver, 'SConscript'))
diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index 3f0596e19c1..635a68eea2c 100644
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -5,7 +5,7 @@ if dri:
 		'dri/SConscript',
 	])
 	
-if env['x11'] and not dri and platform != 'winddk':
+if 'xlib' in env['drivers'] and not dri:
 	SConscript([
 		'xlib/SConscript',
 	])