X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=358c31e847e054c69c36f20309fdd16f0ce98e44;hb=cf0c7258ee0524709ab6d05a9aafc7415361bd23;hp=8be84cddbe727df6187556b9fdda6a12bb31633c;hpb=7d56caabe45e91a67096804c7e341d04d01db7aa;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 8be84cddbe7..358c31e847e 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,38 +1,100 @@
-import os
+Import('env')
 
-Import('*')
+#
+# Auxiliary modules
+#
 
-env = env.Clone()
+SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
 
-auxiliaries = []
+#
+# Drivers
+#
 
-Export('auxiliaries')
+# These are common and work across all platforms
+SConscript([
+    'drivers/llvmpipe/SConscript',
+    'drivers/softpipe/SConscript',
+    'drivers/svga/SConscript',
+    'drivers/swr/SConscript',
+])
+
+#
+# Winsys
+#
+
+SConscript([
+    'winsys/sw/null/SConscript',
+    'winsys/sw/wrapper/SConscript',
+])
+
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
+
+if env['platform'] == 'windows':
+    SConscript([
+        'winsys/sw/gdi/SConscript',
+    ])
 
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
+    ])
 
-if llvm:
-	SConscript(['auxiliary/gallivm/SConscript'])
+if env['dri']:
+    SConscript([
+        'winsys/sw/dri/SConscript',
+        'winsys/svga/drm/SConscript',
+    ])
+
+
+#
+# State trackers and targets
+#
 
 SConscript([
-	# NOTE: order matters!
-	'auxiliary/util/SConscript',
-	'auxiliary/rtasm/SConscript',
-	'auxiliary/tgsi/SConscript',
-	'auxiliary/cso_cache/SConscript',
-	'auxiliary/translate/SConscript',
-	'auxiliary/draw/SConscript',
-	'auxiliary/pipebuffer/SConscript',
-	'auxiliary/indices/SConscript',
-	'auxiliary/rbug/SConscript',
-	'auxiliary/vl/SConscript',
+    'targets/graw-null/SConscript',
 ])
 
-for driver in env['drivers']:
-	SConscript(os.path.join('drivers', driver, 'SConscript'))
+if not env['embedded']:
+    SConscript([
+        'state_trackers/osmesa/SConscript',
+        'targets/osmesa/SConscript',
+    ])
+
+    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',
+        ])
+
 
-SConscript('state_trackers/python/SConscript')
-SConscript('state_trackers/glx/xlib/SConscript')
-SConscript('state_trackers/dri/SConscript')
-SConscript('state_trackers/xorg/SConscript')
+#
+# Unit tests & tools
+#
 
-if platform == 'windows':
-	SConscript('state_trackers/wgl/SConscript')
+if not env['embedded']:
+    SConscript('tests/unit/SConscript')
+    SConscript('tests/graw/SConscript')