X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=816c79c9a184cdd48d5ada99abb3da51c5451c8f;hb=665a4d9d9b883324dbe9ba7ff55c9cb8201bc6b3;hp=c53cd391b1f7dcb4e17cd2f06b196de5b9ccd175;hpb=4ca44f2c5e6b3a0a91626b576d72d306e5c08592;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index c53cd391b1f..816c79c9a18 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -27,19 +27,6 @@ if not env['msvc']:
         'drivers/i915/SConscript',
     ])
 
-if env['drm']:
-    # These drivers depend on drm headers
-    # 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
 #
@@ -58,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')
 
@@ -87,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',
@@ -96,11 +85,6 @@ if env['dri']:
         'winsys/svga/drm/SConscript',
     ])
 
-    if env['drm_intel']:
-        SConscript([
-            'winsys/i915/drm/SConscript',
-        ])
-
 #
 # Targets
 #
@@ -127,22 +111,15 @@ if not env['embedded']:
             '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',
+            'targets/haiku-softpipe/SConscript',
         ])
-        if env['drm_intel']:
-            SConscript([
-                'targets/dri-i915/SConscript',
-            ])
 
-    if env['xorg'] and env['drm']:
+    if env['dri']:
         SConscript([
-            #'targets/xorg-i915/SConscript',
-            #'targets/xorg-nouveau/SConscript',
+            'targets/dri-swrast/SConscript',
+            'targets/dri-vmwgfx/SConscript',
         ])