radeon: drop unused members of radeon_state.

[mesa.git] / common.py

diff --git a/common.py b/common.py
index d9e919ef76c8940cec6b48a4b38bc90c63e95734..3b6bf52c0354e8435a9471362759e03caf5c97f1 100644 (file)
--- a/common.py
+++ b/common.py
@@ -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,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', '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')))
        opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
-                                                                                        allowed_values=('default', 'crossmingw')))
+                                                                                        allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
        opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
        opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))