scons: Enable mesa state tracker in all platforms by default.

But only actually build it on some. This results in a better default
scons experience.

SConstruct

@@ -30,14 +30,15 @@ import common
 # Configuration options
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_statetrackers = 'mesa'
+	default_statetrackers = 'all'
 	default_drivers = 'softpipe,failover,i915simple,i965simple'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_statetrackers = 'none'
+	default_statetrackers = 'all'
 	default_drivers = 'softpipe,i915simple'
 	default_winsys = 'none'
 else:
+	default_statetrackers = 'all'
 	default_drivers = 'all'
 	default_winsys = 'all'
 

src/mesa/SConscript

@@ -4,21 +4,23 @@
 
 Import('*')
 
-env = env.Clone()
+if env['platform'] != 'winddk':
 
-# Includes
+	env = env.Clone()
-env.Append(CPPPATH = [
+	
+	# Includes
+	env.Append(CPPPATH = [
 		'#/src/mesa',
 		'#/src/mesa/main',
-])
+	])
 	
-if gcc:
+	if gcc:
 		env.Append(CFLAGS = [
 			'-std=c99',
 		])
 	
-# x86 assembly
+	# x86 assembly
-if x86 and gcc:
+	if x86 and gcc:
 		env.Append(CPPDEFINES = [
 			'USE_X86_ASM', 
 			'USE_MMX_ASM',
@@ -27,10 +29,10 @@ if x86 and gcc:
 		])
 	
 	
-#######################################################################
+	#######################################################################
-# Core sources
+	# Core sources
 	
-MAIN_SOURCES = [
+	MAIN_SOURCES = [
 		'main/api_arrayelt.c',
 		'main/api_loopback.c',
 		'main/api_noop.c',
@@ -94,15 +96,15 @@ MAIN_SOURCES = [
 		'main/texstore.c',
 		'main/varray.c',
 		'main/vtxfmt.c',
-]
+	]
 	
-GLAPI_SOURCES = [
+	GLAPI_SOURCES = [
 		'main/dispatch.c',
 		'glapi/glapi.c',
 		'glapi/glthread.c',
-]
+	]
 	
-MATH_SOURCES = [
+	MATH_SOURCES = [
 		'math/m_debug_clip.c',
 		'math/m_debug_norm.c',
 		'math/m_debug_xform.c',
@@ -111,9 +113,9 @@ MATH_SOURCES = [
 		'math/m_translate.c',
 		'math/m_vector.c',
 		'math/m_xform.c',
-]
+	]
 	
-VBO_SOURCES = [
+	VBO_SOURCES = [
 		'vbo/vbo_context.c',
 		'vbo/vbo_exec.c',
 		'vbo/vbo_exec_api.c',
@@ -128,15 +130,15 @@ VBO_SOURCES = [
 		'vbo/vbo_save_api.c',
 		'vbo/vbo_save_draw.c',
 		'vbo/vbo_save_loopback.c',
-]
+	]
 	
-VF_SOURCES = [
+	VF_SOURCES = [
 		'vf/vf.c',
 		'vf/vf_generic.c',
 		'vf/vf_sse.c',
-]
+	]
 	
-STATETRACKER_SOURCES = [
+	STATETRACKER_SOURCES = [
 		'state_tracker/st_atom.c',
 		'state_tracker/st_atom_blend.c',
 		'state_tracker/st_atom_clip.c',
@@ -176,9 +178,9 @@ STATETRACKER_SOURCES = [
 		'state_tracker/st_mesa_to_tgsi.c',
 		'state_tracker/st_program.c',
 		'state_tracker/st_texture.c',
-]
+	]
 	
-SHADER_SOURCES = [
+	SHADER_SOURCES = [
 		'shader/arbprogparse.c',
 		'shader/arbprogram.c',
 		'shader/atifragshader.c',
@@ -197,9 +199,9 @@ SHADER_SOURCES = [
 		'shader/prog_uniform.c',
 		'shader/programopt.c',
 		'shader/shader_api.c',
-]
+	]
 	
-SLANG_SOURCES = [
+	SLANG_SOURCES = [
 		'shader/slang/slang_builtin.c',
 		'shader/slang/slang_codegen.c',
 		'shader/slang/slang_compile.c',
@@ -221,13 +223,13 @@ SLANG_SOURCES = [
 		'shader/slang/slang_typeinfo.c',
 		'shader/slang/slang_vartable.c',
 		'shader/slang/slang_utility.c',
-]
+	]
 	
 	
-#######################################################################
+	#######################################################################
-# Assembly sources
+	# Assembly sources
 	
-ASM_C_SOURCES = [
+	ASM_C_SOURCES = [
 		'x86/common_x86.c',
 		'x86/x86.c',
 		'x86/3dnow.c',
@@ -235,9 +237,9 @@ ASM_C_SOURCES = [
 		'sparc/sparc.c',
 		'ppc/common_ppc.c',
 		'x86-64/x86-64.c',
-]
+	]
 	
-X86_SOURCES = [
+	X86_SOURCES = [
 		'x86/common_x86_asm.S',
 		'x86/x86_xform2.S',
 		'x86/x86_xform3.S',
@@ -255,38 +257,38 @@ X86_SOURCES = [
 		'x86/sse_xform4.S',
 		'x86/sse_normal.S',
 		'x86/read_rgba_span_x86.S',
-]
+	]
 	
-X86_API = [
+	X86_API = [
 		'x86/glapi_x86.S',
-]
+	]
 	
-X86_64_SOURCES = [
+	X86_64_SOURCES = [
 		'x86-64/xform4.S',
-]
+	]
 	
-X86_64_API = [
+	X86_64_API = [
 		'x86-64/glapi_x86-64.S',
-]
+	]
 	
-SPARC_SOURCES = [
+	SPARC_SOURCES = [
 		'sparc/clip.S',
 		'sparc/norm.S',
 		'sparc/xform.S',
-]
+	]
 	
-SPARC_API = [
+	SPARC_API = [
 		'sparc/glapi_sparc.S',
-]
+	]
 	
-if x86 and gcc:
+	if x86 and gcc:
 		ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
 		API_SOURCES = X86_API
-else:
+	else:
 		ASM_SOURCES = []
 		API_SOURCES = []
 	
-SOLO_SOURCES = \
+	SOLO_SOURCES = \
 		MAIN_SOURCES + \
 		MATH_SOURCES + \
 		VBO_SOURCES + \
@@ -296,13 +298,13 @@ SOLO_SOURCES = \
 		ASM_SOURCES + \
 		SLANG_SOURCES
 	
-mesa = env.ConvenienceLibrary(
+	mesa = env.ConvenienceLibrary(
 		target = 'mesa',
 		source = SOLO_SOURCES,
-)
+	)
-Export('mesa')
+	Export('mesa')
 	
-if not dri:
+	if not dri:
 		glapi = env.ConvenienceLibrary(
 			target = 'glapi',
 			source = GLAPI_SOURCES + API_SOURCES,