X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=c1dc62465191eb1794a076e3f4d0c756f2ad66e5;hb=7f04f8ddee7d270e7596a145e423df0068875829;hp=4fddcc531ea438f0a9adc10f61eb00b8c5e6553c;hpb=b04aa714afad014f2cdecc3ded9df0586f685921;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 4fddcc531ea..c1dc6246519 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,33 +29,33 @@ import common
 #######################################################################
 # Configuration options
 
+default_statetrackers = 'mesa'
+
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_statetrackers = 'all'
-	default_drivers = 'softpipe,failover,i915simple,i965simple'
+	default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_statetrackers = 'all'
-	default_drivers = 'softpipe,i915simple'
+	default_drivers = 'softpipe,i915simple,trace'
 	default_winsys = 'all'
 else:
-	default_statetrackers = 'all'
 	default_drivers = 'all'
 	default_winsys = 'all'
 
 opts = Options('config.py')
 common.AddOptions(opts)
-opts.Add(ListOption('statetrackers', 'state_trackers to build', default_statetrackers,
-                     ['mesa']))
+opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
+                     ['mesa', 'python']))
 opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell']))
+                     ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi'])) 
 
+opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+
 env = Environment(
-	MSVS_VERSION = '7.1',
 	options = opts,
 	tools = ['gallium'],
-	toolpath = ['scons'],	
+	toolpath = ['#scons'],	
 	ENV = os.environ,
 )