radeon-gallium: Shut up Valgrind.

[mesa.git] / src / gallium / winsys / xlib / SConscript

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 3aef3b6cedddb2e73026fbfeee387553a2a93c07..0fb4b50f634c30286f67957d3b91933319a8c181 100644 (file)
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -13,37 +13,46 @@ if env['platform'] == 'linux' \
     env.Append(CPPPATH = [
         '#/src/mesa',
         '#/src/mesa/main',
+        '#src/gallium/state_trackers/glx/xlib',
     ])
 
+    env.Append(CPPDEFINES = ['USE_XSHM'])
+
     sources = [
-        'glxapi.c',
-        'fakeglx.c',
-        'xfonts.c',
-        'xm_api.c',
-        'xm_winsys.c',
+        'xlib.c',
     ]
 
-    drivers = [];
+    drivers = []
         
     if 'softpipe' in env['drivers']:
+        env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
+        sources += ['xlib_softpipe.c']
         drivers += [softpipe]
 
     if 'i965simple' in env['drivers']:
-        drivers += [i965simple]
+        env.Append(CPPDEFINES = 'GALLIUM_I965SIMPLE')
         sources += [
-            'brw_aub.c',
-            'xm_winsys_aub.c',
-            ]
+            'xlib_brw_aub.c',
+            'xlib_brw_context.c',
+            'xlib_brw_screen.c',
+        ]
+        drivers += [i965simple]
         
+    if 'cell' in env['drivers']:
+        env.Append(CPPDEFINES = 'GALLIUM_CELL')
+        sources += ['xlib_cell.c']
+        drivers += [cell]
+
     if 'trace' in env['drivers']:
         env.Append(CPPDEFINES = 'GALLIUM_TRACE')
+        sources += ['xlib_trace.c']
         drivers += [trace]
 
     # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
     libgl = env.SharedLibrary(
         target ='GL',
         source = sources,
-        LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
+        LIBS = st_xlib + glapi + mesa + drivers + auxiliaries + env['LIBS'],
     )
 
     env.InstallSharedLibrary(libgl, version=(1, 5))