X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=977e3fbf47b8a2fc11768fc592d4921775502688;hb=311b59495c81f26ee3bee4d8c9e36c0ce15be155;hp=207987bedc54f43cd481aa185623637abe2803a3;hpb=7e9f5eab4e18e0b661fc9b65a0f409d10e041b24;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 207987bedc5..977e3fbf47b 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -10,126 +10,96 @@ SConscript('auxiliary/SConscript')
 # Drivers
 #
 
+# These are common and work across all platforms
 SConscript([
-    'drivers/failover/SConscript', 
     'drivers/galahad/SConscript',
-    'drivers/identity/SConscript', 
-    'drivers/llvmpipe/SConscript', 
+    'drivers/identity/SConscript',
+    'drivers/llvmpipe/SConscript',
     'drivers/rbug/SConscript',
     'drivers/softpipe/SConscript',
-    'drivers/svga/SConscript', 
-    'drivers/trace/SConscript', 
+    'drivers/svga/SConscript',
+    'drivers/trace/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/nvfx/SConscript',
-    #     ])
-
 #
-# State trackers
+# Winsys
 #
 
-# Needed by some state trackers
-SConscript('winsys/sw/null/SConscript')
-
-SConscript('state_trackers/python/SConscript')
-if env['platform'] != 'embedded':
-    SConscript('state_trackers/vega/SConscript')
-
-    if env['x11']:
-        SConscript('state_trackers/glx/xlib/SConscript')
-
-    if env['dri']:
-        SConscript('state_trackers/dri/SConscript')
+SConscript([
+    'winsys/sw/null/SConscript',
+    'winsys/sw/wrapper/SConscript',
+])
 
-    if env['dri'] and env['xorg']:
-        SConscript('state_trackers/xorg/SConscript')
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
 
 if env['platform'] == 'windows':
     SConscript([
-        'state_trackers/egl/SConscript',
-        'state_trackers/wgl/SConscript',
+        'winsys/sw/gdi/SConscript',
     ])
 
-#
-# Winsys
-# 
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
+    ])
+
+if env['dri']:
+    SConscript([
+        'winsys/sw/dri/SConscript',
+        'winsys/sw/kms-dri/SConscript',
+        'winsys/svga/drm/SConscript',
+    ])
 
-SConscript('winsys/SConscript')
 
 #
-# Targets
+# State trackers and targets
 #
 
 SConscript([
     'targets/graw-null/SConscript',
 ])
 
-if env['x11']:
-    SConscript([
-        'targets/graw-xlib/SConscript',
-        'targets/libgl-xlib/SConscript',
-    ])
+if not env['embedded']:
+    SConscript('state_trackers/vega/SConscript')
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
+        SConscript([
+            'state_trackers/egl/SConscript',
+            'targets/egl-static/SConscript',
+        ])
 
-if env['platform'] == 'windows':
-    SConscript([
-        'targets/graw-gdi/SConscript',
-        'targets/libgl-gdi/SConscript',
-        #'egl-gdi/SConscript',
-    ])
+    if env['x11']:
+        SConscript([
+            'state_trackers/glx/xlib/SConscript',
+            'targets/graw-xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
 
-if env['dri']:
-    SConscript([
-        'targets/SConscript.dri',
-        'targets/dri-swrast/SConscript',
-        'targets/dri-vmwgfx/SConscript',
-        #'targets/dri-nouveau/SConscript',
-    ])
-    if env['drm_intel']:
+    if env['platform'] == 'windows':
         SConscript([
-            'targets/dri-i915/SConscript',
-            'targets/dri-i965/SConscript',
+            'state_trackers/wgl/SConscript',
+            'targets/graw-gdi/SConscript',
+            'targets/libgl-gdi/SConscript',
         ])
-    if env['drm_radeon']:
+
+    if env['platform'] == 'haiku':
         SConscript([
-            'targets/dri-r300/SConscript',
-            'targets/dri-r600/SConscript',
+            'state_trackers/hgl/SConscript',
+            'targets/haiku-softpipe/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',
-    ])
+    if env['dri']:
+        SConscript([
+            'state_trackers/dri/SConscript',
+            'targets/dri/SConscript',
+        ])
 
 
 #
 # Unit tests & tools
 #
 
-if env['platform'] != 'embedded':
+if not env['embedded']:
     SConscript('tests/unit/SConscript')
     SConscript('tests/graw/SConscript')