X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=32bbdbe568632fab6a41c544226acd2af7e43e2a;hb=1b79582f322d4a89dd6d197c8d4962c788ae7f25;hp=32b7c2980ab7bd433a89c6b5554fb439164e6ef8;hpb=2fe65e8f149e961afb8ccd9b1e57c5c7e96ecfd6;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 32b7c2980ab..32bbdbe5686 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,36 +1,141 @@
-import os
+Import('env')
 
-Import('*')
+# 
+# Auxiliary modules
+#
 
-env = env.Clone()
+SConscript('auxiliary/SConscript')
 
-auxiliaries = []
+#
+# Drivers
+#
 
-Export('auxiliaries')
+# These are common and work across all platforms
+SConscript([
+    'drivers/galahad/SConscript',
+    'drivers/identity/SConscript',
+    'drivers/llvmpipe/SConscript',
+    'drivers/rbug/SConscript',
+    'drivers/softpipe/SConscript',
+    'drivers/svga/SConscript',
+    'drivers/trace/SConscript',
+])
+
+if not env['msvc']:
+    # These drivers do not build on MSVC compilers
+    SConscript([
+        'drivers/i915/SConscript',
+    ])
+
+#
+# State trackers
+#
+
+# Needed by some state trackers
+SConscript('winsys/sw/null/SConscript')
+
+if not env['embedded']:
+    SConscript('state_trackers/vega/SConscript')
+    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+        SConscript('state_trackers/egl/SConscript')
 
+    if env['x11']:
+        SConscript('state_trackers/glx/xlib/SConscript')
 
-if llvm:
-	SConscript(['auxiliary/gallivm/SConscript'])
+    if env['dri']:
+        SConscript('state_trackers/dri/SConscript')
+
+    if env['platform'] == 'windows':
+        SConscript('state_trackers/wgl/SConscript')
+
+#
+# Winsys
+# 
 
 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',
+    'winsys/sw/wrapper/SConscript',
 ])
+    
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
+
+if env['platform'] == 'windows':
+    SConscript([
+        'winsys/sw/gdi/SConscript',
+    ])
+
+if not env['msvc']:
+    SConscript([
+        'winsys/i915/sw/SConscript',
+    ])
+
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
+    ])
+
+if env['dri']:
+    SConscript([
+        'winsys/sw/dri/SConscript',
+    ])
+
+    SConscript([
+        'winsys/svga/drm/SConscript',
+    ])
+
+    if env['drm_intel']:
+        SConscript([
+            'winsys/i915/drm/SConscript',
+        ])
+
+#
+# Targets
+#
+
+SConscript([
+    'targets/graw-null/SConscript',
+])
+
+if not env['embedded']:
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])
+
+    if env['x11']:
+        SConscript([
+            'targets/graw-xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
+
+    if env['platform'] == 'windows':
+        SConscript([
+            'targets/graw-gdi/SConscript',
+            'targets/libgl-gdi/SConscript',
+        ])
+
+    if env['platform'] == 'haiku':
+        SConscript([
+            'targets/haiku-softpipe/SConscript',
+        ])
+
+    if env['dri']:
+        SConscript([
+            'targets/dri-swrast/SConscript',
+            'targets/dri-vmwgfx/SConscript',
+        ])
+        if env['drm_intel']:
+            SConscript([
+                'targets/dri-i915/SConscript',
+            ])
 
-for driver in env['drivers']:
-	SConscript(os.path.join('drivers', driver, 'SConscript'))
 
-SConscript('state_trackers/python/SConscript')
-SConscript('state_trackers/glx/xlib/SConscript')
-SConscript('state_trackers/dri/SConscript')
+#
+# Unit tests & tools
+#
 
-if platform == 'windows':
-	SConscript('state_trackers/wgl/SConscript')
+if not env['embedded']:
+    SConscript('tests/unit/SConscript')
+    SConscript('tests/graw/SConscript')