st/xvmc: fix library installation dir

[mesa.git] / src / gallium / SConscript

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 4f4650698bd95fc73cff136e49a378a020a3cc69..4413bc8742b36e2c52dd89341a2b7fe3327ddfbc 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -10,6 +10,7 @@ SConscript('auxiliary/SConscript')
 # Drivers
 #
 
+# These are common and work across all platforms
 SConscript([
     'drivers/galahad/SConscript',
     'drivers/identity/SConscript',
@@ -24,13 +25,13 @@ if not env['msvc']:
     # These drivers do not build on MSVC compilers
     SConscript([
         'drivers/i915/SConscript',
-        'drivers/r300/SConscript',
     ])
 
 if env['drm']:
     # These drivers depend on drm headers
     if env['drm_radeon']:
         SConscript([
+            'drivers/r300/SConscript',
             'drivers/r600/SConscript',
         ])
     # XXX: nouveau drivers have a tight dependency on libdrm, so to enable
@@ -53,7 +54,7 @@ SConscript('winsys/sw/null/SConscript')
 
 if not env['embedded']:
     SConscript('state_trackers/vega/SConscript')
-    if env['platform'] not in ['darwin']:
+    if env['platform'] not in ['darwin', 'haiku']:
         SConscript('state_trackers/egl/SConscript')
 
     if env['x11']:
@@ -72,7 +73,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
@@ -83,7 +120,7 @@ SConscript([
 ])
 
 if not env['embedded']:
-    if env['platform'] not in ['darwin']:
+    if env['platform'] not in ['darwin', 'haiku']:
         SConscript([
             'targets/egl-static/SConscript'
         ])