Merge branch 'master' into gallium-new-formats

[mesa.git] / src / gallium / winsys / SConscript

diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript
index e8a581adb21a1084b8dab23a4905576a70c17dcf..2013ee97c1c37751b66a5d5efd4c877dc79f1b93 100644 (file)
--- a/src/gallium/winsys/SConscript
+++ b/src/gallium/winsys/SConscript
@@ -1,11 +1,36 @@
 Import('*')
 
-if 'intel' in env['winsys'] and dri:
+if 'xlib' in env['winsys']:
        SConscript([
-               'dri/SConscript',
+               'sw/xlib/SConscript',
        ])
-       
-if 'xlib' in env['winsys'] and not dri:
+
+if 'gdi' in env['winsys']:
+       SConscript([
+               'sw/gdi/SConscript',
+       ])
+
+if env['dri']:
        SConscript([
-               'xlib/SConscript',
+               'sw/dri/SConscript',
        ])
+
+       if 'vmware' in env['winsys']:
+               SConscript([
+                       'svga/drm/SConscript',
+               ])
+
+       if 'i915' in env['winsys']:
+               SConscript([
+                       'i915/drm/SConscript',
+               ])
+
+       if 'i965' in env['winsys']:
+               SConscript([
+                       'i965/drm/SConscript',
+               ])
+
+       if 'radeon' in env['winsys']:
+               SConscript([
+                       'radeon/drm/SConscript',
+               ])