X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=common.py;h=3b6bf52c0354e8435a9471362759e03caf5c97f1;hb=a0549f6634c3573bad5544ad28a208f25c7e4644;hp=d9e919ef76c8940cec6b48a4b38bc90c63e95734;hpb=c4c86bbd16688ee4a0afb32efa27ba52abceb1ca;p=mesa.git

diff --git a/common.py b/common.py
index d9e919ef76c..3b6bf52c035 100644
--- 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))