Merge branch '7.8'

[mesa.git] / common.py

diff --git a/common.py b/common.py
index 1a99df41c01ca6a175850263d71ad11dd0288e0b..928a4496f78f6c504f169c129330c560f157d7c6 100644 (file)
--- a/common.py
+++ b/common.py
@@ -12,7 +12,7 @@ import platform as _platform
 
 _platform_map = {
        'linux2': 'linux',
-       'win32': 'winddk',
+       'win32': 'windows',
 }
 
 default_platform = sys.platform
@@ -33,9 +33,9 @@ else:
        default_machine = _platform.machine()
 default_machine = _machine_map.get(default_machine, 'generic')
 
-if default_platform in ('linux', 'freebsd', 'darwin'):
+if default_platform in ('linux', 'freebsd'):
        default_dri = 'yes'
-elif default_platform in ('winddk', 'windows', 'wince'):
+elif default_platform in ('winddk', 'windows', 'wince', 'darwin'):
        default_dri = 'no'
 else:
        default_dri = 'no'
@@ -46,22 +46,21 @@ 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', 'ppc', 'x86', 'x86_64')))
        opts.Add(EnumOption('platform', 'target platform', default_platform,
-                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
+                                                                                        allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded')))
        opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
-                                                                                        allowed_values=('default', 'crossmingw', 'winddk')))
+                                                                                        allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
        opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
        opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
-