summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-05-01 00:58:04 +0900
committerJosé Fonseca <[email protected]>2008-05-01 02:25:23 +0900
commitc9acd439b1af4b037ded324139664cf9832930f8 (patch)
treed9aa6c522d58db476e0377ebbda6516cd2455b70
parent99fba5466bfd14c4e052041c0571821be529e762 (diff)
scons: Try to cope with scons 0.98+.
-rw-r--r--common.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/common.py b/common.py
index 1c939e0e245..6de181739ba 100644
--- a/common.py
+++ b/common.py
@@ -44,8 +44,14 @@ else:
# Common options
def AddOptions(opts):
- from SCons.Options.BoolOption import BoolOption
- from SCons.Options.EnumOption import EnumOption
+ try:
+ from SCons.Options.BoolOption import BoolOption
+ except ImportError:
+ from SCons.Variables.BoolVariable import BoolVariable as BoolOption
+ try:
+ from SCons.Options.EnumOption import EnumOption
+ except ImportError:
+ from SCons.Variables.EnumVariable import EnumVariable as EnumOption
opts.Add(BoolOption('debug', 'build debug version', 'no'))
#opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,