From c9acd439b1af4b037ded324139664cf9832930f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 1 May 2008 00:58:04 +0900 Subject: [PATCH] scons: Try to cope with scons 0.98+. --- common.py | 10 ++++++++-- 1 file 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, -- 2.30.2