scons: Make command line arguments effective again.

1 files changed, 1 insertions, 4 deletions

diff --git a/common.py b/common.py
index b65ed7eaa..1e5f7dad3 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
 
 
 #######################################################################