Merge commit 'origin/openvg-1.0'

[mesa.git] / common.py

diff --git a/common.py b/common.py
index dd64e0f434de0c6e9b8475cc174f95db43e0aa4e..a687efc86fac7b9cdfbe9324676b67b12f558367 100644 (file)
--- a/common.py
+++ b/common.py
@@ -24,6 +24,7 @@ _machine_map = {
        'i486': 'x86',
        'i586': 'x86',
        'i686': 'x86',
+       'ppc' : 'ppc',
        'x86_64': 'x86_64',
 }
 if 'PROCESSOR_ARCHITECTURE' in os.environ:
@@ -45,20 +46,22 @@ else:
 
 def AddOptions(opts):
        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.Options.BoolOption import BoolOption
+       try:
                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('profile', 'profile build', 'no'))
-       #opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
+       opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
        opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
-                                                                                        allowed_values=('generic', 'x86', 'x86_64')))
+                                                                                        allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
        opts.Add(EnumOption('platform', 'target platform', default_platform,
                                                                                         allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
+       opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
+                                                                                        allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
        opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
        opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))