OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Don't use deprecated Options.

Browse Source
This commit is contained in:
José Fonseca
2009-05-01 16:12:17 +01:00
committed by Keith Whitwell
parent be3f9dd26c
commit 0d0417cc75
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@@ -41,16 +41,16 @@ else:
default_drivers = 'all' default_drivers = 'all'
default_winsys = 'all' default_winsys = 'all'
opts = Options('config.py') opts = Variables('config.py')
common.AddOptions(opts) common.AddOptions(opts)
opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers, opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
['mesa', 'python'])) ['mesa', 'python']))
opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers, opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300'])) ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys, opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
['xlib', 'intel', 'gdi', 'radeon'])) ['xlib', 'intel', 'gdi', 'radeon']))
opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
env = Environment( env = Environment(
options = opts, options = opts,

8
common.py
View File

@@ -46,13 +46,13 @@ else:
def AddOptions(opts): def AddOptions(opts):
try: try:
from SCons.Options.BoolOption import BoolOption
except ImportError:
from SCons.Variables.BoolVariable import BoolVariable as BoolOption from SCons.Variables.BoolVariable import BoolVariable as BoolOption
try:
from SCons.Options.EnumOption import EnumOption
except ImportError: except ImportError:
from SCons.Options.BoolOption import BoolOption
try:
from SCons.Variables.EnumVariable import EnumVariable as EnumOption from SCons.Variables.EnumVariable import EnumVariable as EnumOption
except ImportError:
from SCons.Options.EnumOption import EnumOption
opts.Add(BoolOption('debug', 'debug build', 'no')) opts.Add(BoolOption('debug', 'debug build', 'no'))
opts.Add(BoolOption('profile', 'profile build', 'no')) opts.Add(BoolOption('profile', 'profile build', 'no'))
#opts.Add(BoolOption('quiet', 'quiet command lines', 'no')) #opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))