X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=e9baab0947b1fe056fdf3e8aedfe7d32a887f71e;hb=08e90bdea1e4828abfdff6fedfe9e669bfee9ff1;hp=1e5fd71adcebb588462f520910d90bc983b6ac4d;hpb=b7ffe1e8763efdf042e2d5eb33ce4f3d5d365121;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 1e5fd71adce..e9baab0947b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,25 +32,25 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_drivers = 'softpipe,failover,i915simple,trace'
+	default_drivers = 'softpipe,failover,i915simple,trace,identity,llvmpipe'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_drivers = 'softpipe,i915simple,trace'
+	default_drivers = 'softpipe,i915simple,trace,identity'
 	default_winsys = 'all'
 else:
 	default_drivers = 'all'
 	default_winsys = 'all'
 
-opts = Options('config.py')
+opts = Variables('config.py')
 common.AddOptions(opts)
-opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
-                     ['mesa', 'python']))
-opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
-opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
+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', 'i915simple', 'i965simple', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
+opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi', 'radeon']))
 
-opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
 env = Environment(
 	options = opts,