nvc0/ir: use manual TXD when offsets are involved

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index a3edc655432e36f2cc8cb27cd4f09c3904519432..df71b9aeada7daf9aa09d43862de58913305a863 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -21,12 +21,6 @@ SConscript([
     'drivers/trace/SConscript',
 ])
 
-if not env['msvc']:
-    # These drivers do not build on MSVC compilers
-    SConscript([
-        'drivers/i915/SConscript',
-    ])
-
 #
 # State trackers
 #
@@ -45,9 +39,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')
 
@@ -69,9 +60,9 @@ 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']:
@@ -83,11 +74,6 @@ if env['dri']:
         'winsys/svga/drm/SConscript',
     ])
 
-    if env['drm_intel']:
-        SConscript([
-            'winsys/i915/drm/SConscript',
-        ])
-
 #
 # Targets
 #
@@ -114,20 +100,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/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/dri-swrast/SConscript',
+            'targets/dri/SConscript',
         ])