X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=f281f4c6567dc39f37dc0f160ccf8a145415e63c;hb=0fa2d0e98aec1e864f7edc225eb9cda449051733;hp=3072ee936f2793a834f55bacec6875485cba1d2b;hpb=c3b2230b71cb3a00a7f4c0987197d397bada650b;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 3072ee936f2..f281f4c6567 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -10,31 +10,34 @@ 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',
+        '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
@@ -55,7 +58,8 @@ SConscript('winsys/sw/null/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
-    SConscript('state_trackers/egl/SConscript')
+    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+        SConscript('state_trackers/egl/SConscript')
 
     if env['x11']:
         SConscript('state_trackers/glx/xlib/SConscript')
@@ -73,7 +77,43 @@ if not env['embedded']:
 # Winsys
 # 
 
-SConscript('winsys/SConscript')
+SConscript([
+    'winsys/sw/wrapper/SConscript',
+])
+    
+if env['x11']:
+    SConscript([
+        'winsys/sw/xlib/SConscript',
+    ])
+
+if env['platform'] == 'windows':
+    SConscript([
+        'winsys/sw/gdi/SConscript',
+    ])
+
+if not env['msvc']:
+    SConscript([
+        'winsys/i915/sw/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
@@ -84,9 +124,10 @@ SConscript([
 ])
 
 if not env['embedded']:
-    SConscript([
-        'targets/egl-static/SConscript'
-    ])
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])
 
     if env['x11']:
         SConscript([
@@ -110,21 +151,22 @@ if not env['embedded']:
         if env['drm_intel']:
             SConscript([
                 'targets/dri-i915/SConscript',
-                'targets/dri-i965/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']:
         SConscript([
             #'targets/xorg-i915/SConscript',
-            #'targets/xorg-i965/SConscript',
             #'targets/xorg-nouveau/SConscript',
             #'targets/xorg-radeon/SConscript',
-            'targets/xorg-vmwgfx/SConscript',
         ])