X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=98ba88588d54d516570f31c124fa42f407d5edf7;hb=e2ffd2110e98715fe4ebf8e8e7f3cc636e25d38e;hp=b5bc9ecfd9e02f6f1a36c87cc16dfad64547beb0;hpb=c69979f243fe7ac15d638f9b2b5cf35b30b07939;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b5bc9ecfd9e..98ba88588d5 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,118 +1,56 @@
 Import('env')
 
-# 
+#
 # Auxiliary modules
 #
 
 SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
 
 #
 # Drivers
 #
 
+# These are common and work across all platforms
 SConscript([
-    'drivers/failover/SConscript', 
-    'drivers/galahad/SConscript',
-    'drivers/identity/SConscript', 
-    'drivers/llvmpipe/SConscript', 
-    'drivers/rbug/SConscript',
+    'drivers/llvmpipe/SConscript',
     'drivers/softpipe/SConscript',
-    'drivers/svga/SConscript', 
-    'drivers/trace/SConscript', 
+    'drivers/svga/SConscript',
 ])
 
-if not env['msvc']:
-    # These drivers do not build on MSVC compilers
-    SConscript([
-        'drivers/i915/SConscript', 
-        'drivers/i965/SConscript',
-        'drivers/r300/SConscript',
-    ])
-
-if env['dri']:
-    # These drivers depend on drm headers
-    SConscript([
-        # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
-        # we need some version logic before we enable them. Also, ATM there is
-        # no nouveau target in scons
-        #'drivers/nouveau/SConscript', 
-        #'drivers/nv50/SConscript', 
-        #'drivers/nvfx/SConscript',
-        'drivers/r600/SConscript', 
-    ])
-
-#
-# State trackers
-#
-
-# Needed by some state trackers
-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['platform'] == 'windows':
-	SConscript('state_trackers/wgl/SConscript')
-
 #
 # Winsys
-# 
-
-SConscript('winsys/SConscript')
-
-#
-# Targets
 #
 
 SConscript([
-    'targets/graw-null/SConscript',
+    'winsys/sw/null/SConscript',
+    'winsys/sw/wrapper/SConscript',
 ])
 
 if env['x11']:
     SConscript([
-        'targets/graw-xlib/SConscript',
-        'targets/libgl-xlib/SConscript',
+        'winsys/sw/xlib/SConscript',
     ])
 
 if env['platform'] == 'windows':
     SConscript([
-        'targets/graw-gdi/SConscript',
-        'targets/libgl-gdi/SConscript',
-        #'egl-gdi/SConscript',
-    ])
-
-if env['dri']:
-    SConscript([
-        'targets/SConscript.dri',
-	    'targets/dri-i915/SConscript',
-	    'targets/dri-i965/SConscript',
-	    #'targets/dri-nouveau/SConscript',
-	    'targets/dri-r300/SConscript',
-        'targets/dri-r600/SConscript',
-	    'targets/dri-swrast/SConscript',
-	    'targets/dri-vmwgfx/SConscript',
-    ])
-
-if env['xorg']:
-    SConscript([
-        #'targets/xorg-i915/SConscript',
-        #'targets/xorg-i965/SConscript',
-        #'targets/xorg-nouveau/SConscript',
-        #'targets/xorg-radeon/SConscript',
-        'targets/xorg-vmwgfx/SConscript',
+        'winsys/sw/gdi/SConscript',
     ])
 
 
 #
-# Unit tests & tools
+# Frontends and targets
 #
 
-if env['platform'] != 'embedded':
-	SConscript('tests/unit/SConscript')
-	SConscript('tests/graw/SConscript')
+if not env['embedded']:
+    if env['x11']:
+        SConscript([
+            'frontends/glx/xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
 
+    if env['platform'] == 'windows':
+        SConscript([
+            'frontends/wgl/SConscript',
+            'targets/libgl-gdi/SConscript',
+        ])