summaryrefslogtreecommitdiffstats
path: root/common.py
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-03-03 18:52:37 +0100
committerJosé Fonseca <[email protected]>2008-03-03 18:54:45 +0100
commit13174c195e057f443b23df788ea0c10251942189 (patch)
tree79362091bbdd98486129b09ee9ac7f4ab4f33036 /common.py
parent689e1c5d501eb2f557f85dd3279ac5d91e53b0ad (diff)
scons: Make command line arguments effective again.
Diffstat (limited to 'common.py')
-rw-r--r--common.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/common.py b/common.py
index b65ed7eaaa7..1e5f7dad39b 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
#######################################################################