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.

---
 common.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'common.py')

diff --git a/common.py b/common.py
index b65ed7eaaa..1e5f7dad39 100644
--- a/common.py
+++ b/common.py
@@ -43,11 +43,9 @@ else:
 #######################################################################
 # Common options
 
-def Options():
-	from SCons.Options import Options
+def AddOptions(opts):
 	from SCons.Options.BoolOption import BoolOption
 	from SCons.Options.EnumOption import EnumOption
-	opts = Options('config.py')
 	opts.Add(BoolOption('debug', 'build debug version', 'no'))
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'x86', 'x86_64')))
@@ -55,7 +53,6 @@ def Options():
 											 allowed_values=('linux', 'cell', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
-	return opts
 
 
 #######################################################################
-- 
cgit v1.2.3