Merge branch 'softpipe-opt'

[mesa.git] / src / gallium / state_trackers / glx / xlib / SConscript

diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
index 01641e90e4710231ffeb7bfc0ffc33a821c375a4..fa96df357d5e267af49b5c12a9d75b48df366bdf 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/SConscript
+++ b/src/gallium/state_trackers/glx/xlib/SConscript
@@ -4,8 +4,7 @@
 Import('*')
 
 if env['platform'] == 'linux' \
-        and 'mesa' in env['statetrackers'] \
-        and ('softpipe' or 'i915simple' or 'trace') in env['drivers']:
+        and 'mesa' in env['statetrackers']:
 
     env = env.Clone()
 
@@ -14,11 +13,14 @@ if env['platform'] == 'linux' \
         '#/src/mesa/main',
     ])
 
+    env.Append(CPPDEFINES = ['USE_XSHM'])
+
     st_xlib = env.ConvenienceLibrary(
        target = 'st_xlib',
-       source = [ 'glxapi.c',
-               'fakeglx.c',
-               'fakeglx_fonts.c',
+       source = [
+               'glx_api.c',
+               'glx_getproc.c',
+               'glx_usefont.c',
                'xm_api.c',
                ]
     )