X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=c1dc62465191eb1794a076e3f4d0c756f2ad66e5;hb=32250eb959b1355b2f6984ea892a86a6ecf9d3c3;hp=5f7b6dd4d118444f273469e7af32ad71e68304bd;hpb=b215d7d10c011adce839b80f87c0ea03a3edd427;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 5f7b6dd4d11..c1dc6246519 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,30 +29,36 @@ import common
 #######################################################################
 # Configuration options
 
+default_statetrackers = 'mesa'
+
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_statetrackers = 'mesa'
-	default_drivers = 'softpipe,failover,i915simple,i965simple'
+	default_drivers = 'softpipe,failover,i915simple,i965simple,trace'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_statetrackers = 'none'
-	default_drivers = 'softpipe,i915simple'
-	default_winsys = 'none'
+	default_drivers = 'softpipe,i915simple,trace'
+	default_winsys = 'all'
 else:
 	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'])) 
+                     ['xlib', 'intel', 'gdi'])) 
+
+opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
 env = Environment(
-	options = opts, 
-	ENV = os.environ)
+	options = opts,
+	tools = ['gallium'],
+	toolpath = ['#scons'],	
+	ENV = os.environ,
+)
+
 Help(opts.GenerateHelpText(env))
 
 # replicate options values in local variables
@@ -80,25 +86,6 @@ Export([
 
 #######################################################################
 # Environment setup
-#
-# TODO: put the compiler specific settings in separate files
-# TODO: auto-detect as much as possible
-
-if platform == 'winddk':
-	env.Tool('winddk', ['scons'])
-	
-	env.Append(CPPPATH = [
-		env['SDK_INC_PATH'],
-		env['DDK_INC_PATH'],
-		env['WDM_INC_PATH'],
-		env['CRT_INC_PATH'],
-	])
-
-if platform == 'wince':
-	env.Tool('evc', ['scons'])
-
-common.generate(env)
-
 
 # Includes
 env.Append(CPPPATH = [
@@ -109,13 +96,6 @@ env.Append(CPPPATH = [
 ])
 
 
-# x86 assembly
-if x86:
-	if gcc:	
-		env.Append(CFLAGS = '-m32')
-		env.Append(CXXFLAGS = '-m32')
-
-
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):
 	env.Append(CPPDEFINES = [
@@ -180,6 +160,6 @@ Export('env')
 
 SConscript(
 	'src/SConscript',
-	build_dir = common.make_build_dir(env),
+	build_dir = env['build'],
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )