diff options
| author | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-12-22 09:40:39 +0000 |
| commit | aa02683e45f1eaf61bba2ba7eeda7686efeed2ca (patch) | |
| tree | 63e0ef2fa85e5d7ebd6ffc6ae9043ce0819251a2 /SConstruct | |
| parent | ebbc73d1aed283c9bc4aa2b37bed4374bbaec5b5 (diff) | |
| parent | 0fc4dd3819af252c028ed43bbd668b4f34104e32 (diff) | |
Merge branch 'i965g-restart'
Conflicts:
configure.ac
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 122b8cf916f..8e063e28078 100644 --- a/SConstruct +++ b/SConstruct @@ -32,10 +32,10 @@ import common default_statetrackers = 'mesa' if common.default_platform in ('linux', 'freebsd', 'darwin'): - default_drivers = 'softpipe,failover,svga,i915,trace,identity,llvmpipe' + default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe' default_winsys = 'xlib' elif common.default_platform in ('winddk',): - default_drivers = 'softpipe,svga,i915,trace,identity' + default_drivers = 'softpipe,svga,i915,i965,trace,identity' default_winsys = 'all' else: default_drivers = 'all' @@ -46,9 +46,9 @@ common.AddOptions(opts) opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers, ['mesa', 'python', 'xorg'])) opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers, - ['softpipe', 'failover', 'svga', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe'])) + ['softpipe', 'failover', 'svga', 'i915', 'i965', 'cell', 'trace', 'r300', 'identity', 'llvmpipe'])) opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys, - ['xlib', 'vmware', 'intel', 'gdi', 'radeon'])) + ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon'])) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) |