Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

1 files changed, 29 insertions, 25 deletions

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 14a85ae0f2..8650f595a7 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -9,31 +9,35 @@ if env['platform'] == 'linux' \
         and 'i965simple' in env['drivers'] \
         and not env['dri']:
 
-	env = env.Clone()
+    env = env.Clone()
 
-	env.Append(CPPPATH = [
-		'#/src/mesa',
-		'#/src/mesa/main',
-	])
+    env.Append(CPPPATH = [
+        '#/src/mesa',
+        '#/src/mesa/main',
+    ])
 
-	sources = [
-		'glxapi.c',
-		'fakeglx.c',
-		'xfonts.c',
-		'xm_api.c',
-		'xm_winsys.c',
-		'xm_winsys_aub.c',
-		'brw_aub.c',
-	]
-		
-	drivers = [
-		softpipe,
-		i965simple
-	]
+    sources = [
+        'glxapi.c',
+        'fakeglx.c',
+        'xfonts.c',
+        'xm_api.c',
+        'xm_winsys.c',
+        'xm_winsys_aub.c',
+        'brw_aub.c',
+    ]
+        
+    drivers = [
+        softpipe,
+        i965simple,
+    ]
+    
+    if 'trace' in env['drivers']:
+        env.Append(CPPDEFINES = 'GALLIUM_TRACE')
+        drivers += [trace]
 
-	# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-	env.SharedLibrary(
-		target ='GL',
-		source = sources,
-		LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
-	)
+    # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
+    env.SharedLibrary(
+        target ='GL',
+        source = sources,
+        LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
+    )