summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-03-03 18:52:37 +0100
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-03-03 18:54:45 +0100
commit13174c195e057f443b23df788ea0c10251942189 (patch)
tree79362091bbdd98486129b09ee9ac7f4ab4f33036 /SConstruct
parent689e1c5d501eb2f557f85dd3279ac5d91e53b0ad (diff)
scons: Make command line arguments effective again.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct6
1 files changed, 2 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 8013e7c3b2..6f95d123ff 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,18 +33,16 @@ if common.default_platform in ('linux', 'freebsd', 'darwin'):
default_statetrackers = 'mesa'
default_drivers = 'softpipe,failover,i915simple,i965simple'
default_winsys = 'xlib'
- default_dri = 'yes'
elif common.default_platform in ('winddk',):
default_statetrackers = 'none'
default_drivers = 'softpipe,i915simple'
default_winsys = 'none'
- default_dri = 'no'
else:
default_drivers = 'all'
default_winsys = 'all'
- default_dri = 'no'
-opts = common.Options()
+opts = Options('config.py')
+common.AddOptions(opts)
opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
['mesa']))
opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,