X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=ca75f37f9d99f4a42816dc52fb036293888031f3;hb=84fce45321166e55c03c95ece29d4c27de6740a6;hp=63435a306584bb771a24b4c9ce1dd57534d489a2;hpb=b4ac0adb75bddc1c17c57eb19c7e6dde52e4b7e7;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 63435a30658..ca75f37f9d9 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -10,35 +10,21 @@ 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['dri']:
-    # These drivers depend on drm headers
-    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
-        #'drivers/nouveau/SConscript', 
-        #'drivers/nv50/SConscript', 
-        #'drivers/nvfx/SConscript',
-        'drivers/r600/SConscript', 
+        'drivers/i915/SConscript',
     ])
 
 #
@@ -48,70 +34,117 @@ if env['dri']:
 # Needed by some state trackers
 SConscript('winsys/sw/null/SConscript')
 
-SConscript('state_trackers/python/SConscript')
-if env['platform'] != 'embedded':
-    SConscript('state_trackers/glx/xlib/SConscript')
-    SConscript('state_trackers/dri/SConscript')
-    SConscript('state_trackers/xorg/SConscript')
-    SConscript('state_trackers/egl/SConscript')
+if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
+    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
+        SConscript('state_trackers/egl/SConscript')
 
-if env['platform'] == 'windows':
-    SConscript('state_trackers/wgl/SConscript')
+    if env['x11']:
+        SConscript('state_trackers/glx/xlib/SConscript')
 
-#
-# Winsys
-# 
+    if env['dri']:
+        SConscript('state_trackers/dri/SConscript')
 
-SConscript('winsys/SConscript')
+    if env['dri'] and env['xorg']:
+        SConscript('state_trackers/xorg/SConscript')
+
+    if env['platform'] == 'windows':
+        SConscript('state_trackers/wgl/SConscript')
 
 #
-# Targets
-#
+# Winsys
+# 
 
 SConscript([
-    'targets/graw-null/SConscript',
+    'winsys/sw/wrapper/SConscript',
 ])
-
+    
 if env['x11']:
     SConscript([
-        'targets/graw-xlib/SConscript',
-        'targets/libgl-xlib/SConscript',
+        'winsys/sw/xlib/SConscript',
     ])
 
 if env['platform'] == 'windows':
     SConscript([
-        'targets/graw-gdi/SConscript',
-        'targets/libgl-gdi/SConscript',
-        #'egl-gdi/SConscript',
+        'winsys/sw/gdi/SConscript',
+    ])
+
+if not env['msvc']:
+    SConscript([
+        'winsys/i915/sw/SConscript',
+    ])
+
+if env['platform'] == 'haiku':
+    SConscript([
+        'winsys/sw/hgl/SConscript',
     ])
 
 if env['dri']:
     SConscript([
-        'targets/SConscript.dri',
-        'targets/dri-i915/SConscript',
-        'targets/dri-i965/SConscript',
-        #'targets/dri-nouveau/SConscript',
-        'targets/dri-r300/SConscript',
-        'targets/dri-r600/SConscript',
-        'targets/dri-swrast/SConscript',
-        'targets/dri-vmwgfx/SConscript',
+        'winsys/sw/dri/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',
+        'winsys/svga/drm/SConscript',
     ])
 
+    if env['drm_intel']:
+        SConscript([
+            'winsys/i915/drm/SConscript',
+        ])
+
+#
+# Targets
+#
+
+SConscript([
+    'targets/graw-null/SConscript',
+])
+
+if not env['embedded']:
+    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
+        SConscript([
+            'targets/egl-static/SConscript'
+        ])
+
+    if env['x11']:
+        SConscript([
+            'targets/graw-xlib/SConscript',
+            'targets/libgl-xlib/SConscript',
+        ])
+
+    if env['platform'] == 'windows':
+        SConscript([
+            'targets/graw-gdi/SConscript',
+            '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',
+        ])
+        if env['drm_intel']:
+            SConscript([
+                'targets/dri-i915/SConscript',
+            ])
+
+    if env['xorg'] and env['drm']:
+        SConscript([
+            #'targets/xorg-i915/SConscript',
+        ])
+
 
 #
 # Unit tests & tools
 #
 
-if env['platform'] != 'embedded':
+if not env['embedded']:
     SConscript('tests/unit/SConscript')
     SConscript('tests/graw/SConscript')