From 13174c195e057f443b23df788ea0c10251942189 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 3 Mar 2008 18:52:37 +0100
Subject: scons: Make command line arguments effective again.

---
 SConstruct | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'SConstruct')

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,
-- 
cgit v1.2.3