X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=common.py;h=e57429eb75e1a3f6bdfef80531ed1846b8f1e4e6;hb=e2aedfa62079ff1a333e1f4e56faea303cc36edb;hp=1a99df41c01ca6a175850263d71ad11dd0288e0b;hpb=8abc860bd46a6cd584f9a64cb4613be76f82db06;p=mesa.git

diff --git a/common.py b/common.py
index 1a99df41c01..e57429eb75e 100644
--- a/common.py
+++ b/common.py
@@ -46,13 +46,13 @@ 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'))
@@ -61,7 +61,7 @@ def AddOptions(opts):
 	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', 'winddk')))
+											 allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))