X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=98ba88588d54d516570f31c124fa42f407d5edf7;hb=36bd3e986830bbf7435389cdd68e593b8b43f234;hp=31580556f031d0c3ecb3e166e9378bcba644ebdb;hpb=e24f1ea594cc919a015ca14ff5abb305d51a314d;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 31580556f03..98ba88588d5 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,138 +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['drm']:
-    # These drivers depend on drm headers
-    if env['drm_radeon']:
-        SConscript([
-            'drivers/r600/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
-    # if env['drm_nouveau']:
-    #     SConscript([
-    #         'drivers/nouveau/SConscript', 
-    #         'drivers/nv50/SConscript', 
-    #         'drivers/nvc0/SConscript', 
-    #         'drivers/nvfx/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/vega/SConscript')
-    SConscript('state_trackers/egl/SConscript')
-
-    if env['x11']:
-        SConscript('state_trackers/glx/xlib/SConscript')
-
-    if env['dri']:
-        SConscript('state_trackers/dri/SConscript')
-
-    if env['dri'] and env['xorg']:
-        SConscript('state_trackers/xorg/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['platform'] != 'embedded':
-    SConscript([
-        'targets/egl-static/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',
-    ])
-
-if env['dri']:
-    SConscript([
-        'targets/SConscript.dri',
-        'targets/dri-swrast/SConscript',
-        'targets/dri-vmwgfx/SConscript',
-        #'targets/dri-nouveau/SConscript',
-    ])
-    if env['drm_intel']:
-        SConscript([
-            'targets/dri-i915/SConscript',
-            'targets/dri-i965/SConscript',
-        ])
-    if env['drm_radeon']:
-        SConscript([
-            'targets/dri-r300/SConscript',
-            'targets/dri-r600/SConscript',
-        ])
-
-if env['xorg'] and env['drm']:
-    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',
+        ])