commit e9fb90ab8889136f788a3d9dc395b0f4d46cfdcc
author José Fonseca <jfonseca@vmware.com> Fri May 01 16:12:17 2009 +0100
committer Keith Whitwell <keithw@vmware.com> Tue May 05 13:14:51 2009 +0100
tree 434a9baada2b0f895cf0087edaf316239fe8618b
parent 3537c3420d0887ed22565b9e4469952b99f1b76f

scons: Don't use deprecated Options.

SConstruct

diff --git a/SConstruct b/SConstruct
index 1e5fd71..89144f7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -41,16 +41,16 @@
 	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,
+opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python']))
-opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
+opts.Add(ListVariable('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('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,