X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=32bbdbe568632fab6a41c544226acd2af7e43e2a;hb=822ac968024b1f1aacb729e25b811908237e3beb;hp=da2e4dd5dedf5bedd11e1e13a6c1d76e80a74e9c;hpb=a75c6163e605f35b14f26930dd9227e4f337ec9e;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index da2e4dd5ded..32bbdbe5686 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,25 +27,6 @@ if not env['msvc']:
         'drivers/i915/SConscript',
     ])
 
-if env['drm']:
-    # These drivers depend on drm headers
-    if env['drm_radeon']:
-        SConscript([
-            'drivers/r300/SConscript',
-            'drivers/r600/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
 #
@@ -55,7 +36,7 @@ SConscript('winsys/sw/null/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
-    if env['platform'] not in ['darwin', 'haiku']:
+    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
         SConscript('state_trackers/egl/SConscript')
 
     if env['x11']:
@@ -64,9 +45,6 @@ if not env['embedded']:
     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')
 
@@ -93,6 +71,11 @@ if not env['msvc']:
         'winsys/i915/sw/SConscript',
     ])
 
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
+    ])
+
 if env['dri']:
     SConscript([
         'winsys/sw/dri/SConscript',
@@ -107,11 +90,6 @@ if env['dri']:
             'winsys/i915/drm/SConscript',
         ])
 
-    if env['drm_radeon']:
-        SConscript([
-            'winsys/radeon/drm/SConscript',
-        ])
-
 #
 # Targets
 #
@@ -121,7 +99,7 @@ SConscript([
 ])
 
 if not env['embedded']:
-    if env['platform'] not in ['darwin', 'haiku']:
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
         SConscript([
             'targets/egl-static/SConscript'
         ])
@@ -138,30 +116,20 @@ if not env['embedded']:
             'targets/libgl-gdi/SConscript',
         ])
 
+    if env['platform'] == 'haiku':
+        SConscript([
+            'targets/haiku-softpipe/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',
             ])
-        if env['drm_radeon']:
-            SConscript([
-                'targets/dri-r300/SConscript',
-                'targets/dri-r600/SConscript',
-                'targets/dri-radeonsi/SConscript',
-            ])
-
-    if env['xorg'] and env['drm']:
-        SConscript([
-            #'targets/xorg-i915/SConscript',
-            #'targets/xorg-nouveau/SConscript',
-            #'targets/xorg-radeon/SConscript',
-        ])
 
 
 #