i915g: Rename winsys prefix to i915_ from intel_

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index ea63b90f46fb19ce57c632948e1d7eeb1e243ee9..2549a13fffaca4c55e573da9bdeca3a1472309fb 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -52,7 +52,7 @@ opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statet
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
+                     ['xlib', 'vmware', 'i915', 'i965', 'gdi', 'radeon']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -110,12 +110,19 @@ Export([
 #######################################################################
 # Environment setup
 
+# Always build trace and identity drivers
+if 'trace' not in env['drivers']:
+    env['drivers'].append('trace')
+if 'identity' not in env['drivers']:
+    env['drivers'].append('identity')
+
 # Includes
 env.Append(CPPPATH = [
        '#/include',
        '#/src/gallium/include',
        '#/src/gallium/auxiliary',
        '#/src/gallium/drivers',
+       '#/src/gallium/winsys',
 ])
 
 if env['msvc']: