X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2FSConscript;h=680ad925f5fa82e86d1fc30cc16351c373ac16f5;hb=56076be2ac60f005770516a9ac305e60e6285497;hp=f47907eed3659fb58f23d67ee473f86265a053f6;hpb=a8e195ec24dc244d975cbd3526debc2c22e717be;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index f47907eed36..680ad925f5f 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,29 +1,96 @@
-import os
+Import('env')
 
-Import('*')
+# 
+# Auxiliary modules
+#
 
 SConscript('auxiliary/SConscript')
 
-for driver in env['drivers']:
-	SConscript(os.path.join('drivers', driver, 'SConscript'))
+#
+# Drivers
+#
 
-# Needed by some state trackers
-SConscript('winsys/sw/null/SConscript')
+# These are common and work across all platforms
+SConscript([
+    'drivers/llvmpipe/SConscript',
+    'drivers/rbug/SConscript',
+    'drivers/softpipe/SConscript',
+    'drivers/svga/SConscript',
+    'drivers/trace/SConscript',
+])
 
-SConscript('state_trackers/python/SConscript')
-if platform != 'embedded':
-	SConscript('state_trackers/glx/xlib/SConscript')
-	SConscript('state_trackers/dri/SConscript')
-	SConscript('state_trackers/xorg/SConscript')
-	SConscript('state_trackers/egl/SConscript')
+#
+# Winsys
+#
 
-if platform == 'windows':
-	SConscript('state_trackers/wgl/SConscript')
+SConscript([
+    'winsys/sw/null/SConscript',
+    'winsys/sw/wrapper/SConscript',
+])
 
-SConscript('winsys/SConscript')
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
 
-SConscript('targets/SConscript')
+if env['platform'] == 'windows':
+    SConscript([
+        'winsys/sw/gdi/SConscript',
+    ])
 
-if platform != 'embedded':
-	SConscript('tests/unit/SConscript')
-	#SConscript('tests/graw/SConscript')
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
+    ])
+
+if env['dri']:
+    SConscript([
+        'winsys/sw/dri/SConscript',
+        'winsys/sw/kms-dri/SConscript',
+        'winsys/svga/drm/SConscript',
+    ])
+
+
+#
+# State trackers and targets
+#
+
+SConscript([
+    'targets/graw-null/SConscript',
+])
+
+if not env['embedded']:
+    if env['x11']:
+        SConscript([
+            'state_trackers/glx/xlib/SConscript',
+            'targets/graw-xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
+
+    if env['platform'] == 'windows':
+        SConscript([
+            'state_trackers/wgl/SConscript',
+            'targets/graw-gdi/SConscript',
+            'targets/libgl-gdi/SConscript',
+        ])
+
+    if env['platform'] == 'haiku':
+        SConscript([
+            'state_trackers/hgl/SConscript',
+            'targets/haiku-softpipe/SConscript',
+        ])
+
+    if env['dri']:
+        SConscript([
+            'state_trackers/dri/SConscript',
+            'targets/dri/SConscript',
+        ])
+
+
+#
+# Unit tests & tools
+#
+
+if not env['embedded']:
+    SConscript('tests/unit/SConscript')
+    SConscript('tests/graw/SConscript')