X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=9273db7e4989a0975a5e98091e4efaf90bc6c73f;hb=ce65cc1f1f648f17d9284e65f1ad69be647de3d3;hp=b61eba0390e19acfdbbdc7261b939206e483d941;hpb=bb4c5d72d7c7cb1d9e7016e2c07c36875f30011a;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b61eba0390e..9273db7e498 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,10 +1,11 @@
 Import('env')
 
-# 
+#
 # Auxiliary modules
 #
 
 SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
 
 #
 # Drivers
@@ -12,75 +13,23 @@ SConscript('auxiliary/SConscript')
 
 # 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',
+    'drivers/swr/SConscript',
 ])
 
-if not env['msvc']:
-    # These drivers do not build on MSVC compilers
-    SConscript([
-        'drivers/i915/SConscript',
-    ])
-
-if env['drm']:
-    # These drivers depend on drm headers
-    if env['drm_radeon']:
-        SConscript([
-            'drivers/r300/SConscript',
-            'drivers/r600/SConscript',
-        ])
-        if env['llvm']:
-            SConscript([
-                'drivers/radeonsi/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')
-
-if not env['embedded']:
-    SConscript('state_trackers/vega/SConscript')
-    if env['platform'] not in ['darwin', 'haiku', 'sunos']:
-        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/sw/null/SConscript',
     'winsys/sw/wrapper/SConscript',
 ])
-    
+
 if env['x11']:
     SConscript([
         'winsys/sw/xlib/SConscript',
@@ -91,32 +40,20 @@ if env['platform'] == 'windows':
         'winsys/sw/gdi/SConscript',
     ])
 
-if not env['msvc']:
+if env['platform'] == 'haiku':
     SConscript([
-        'winsys/i915/sw/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',
-        ])
-
-    if env['drm_radeon']:
-        SConscript([
-            'winsys/radeon/drm/SConscript',
-        ])
 
 #
-# Targets
+# State trackers and targets
 #
 
 SConscript([
@@ -124,49 +61,35 @@ SConscript([
 ])
 
 if not env['embedded']:
-    if env['platform'] not in ['darwin', 'haiku', 'sunos']:
-        SConscript([
-            'targets/egl-static/SConscript'
-        ])
+    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['dri']:
+    if env['platform'] == 'haiku':
         SConscript([
-            'targets/SConscript.dri',
-            'targets/dri-swrast/SConscript',
-            'targets/dri-vmwgfx/SConscript',
-            #'targets/dri-nouveau/SConscript',
+            'state_trackers/hgl/SConscript',
+            'targets/haiku-softpipe/SConscript',
         ])
-        if env['drm_intel']:
-            SConscript([
-                'targets/dri-i915/SConscript',
-            ])
-        if env['drm_radeon']:
-            SConscript([
-                'targets/dri-r300/SConscript',
-                'targets/dri-r600/SConscript',
-            ])
-            if env['llvm']:
-                SConscript([
-                    'targets/dri-radeonsi/SConscript',
-                ])
-
-    if env['xorg'] and env['drm']:
+
+    if env['dri']:
         SConscript([
-            #'targets/xorg-i915/SConscript',
-            #'targets/xorg-nouveau/SConscript',
-            #'targets/xorg-radeon/SConscript',
+            'state_trackers/dri/SConscript',
+            'targets/dri/SConscript',
         ])