X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Ftargets%2Flibgl-xlib%2FSConscript;h=63e4531263a691988a885ce233ce17f212c5905b;hb=1fa7789e828d1005e2473fc7cd364bd45eb30843;hp=92e508ee50c9b8ad3c420a4d49d62f40313de7e1;hpb=0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330;p=mesa.git

diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 92e508ee50c..63e4531263a 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -14,10 +14,6 @@ if env['dri']:
     print 'warning: DRI enabled: skipping build of xlib libGL.so'
     Return()
 
-if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']):
-    print 'warning: no supported pipe driver: skipping build of xlib libGL.so'
-    Return()
-
 env = env.Clone()
 
 env.Append(CPPPATH = [
@@ -28,35 +24,40 @@ env.Append(CPPPATH = [
 
 env.Append(CPPDEFINES = ['USE_XSHM'])
 
+env.Prepend(LIBS = [
+    st_xlib,
+    ws_xlib,
+    trace,
+    identity,
+    glapi,
+    mesa,
+    glsl,
+    gallium,
+])
+
 sources = [
     'xlib.c',
 ]
 
-drivers = [trace]
-    
-if 'softpipe' in env['drivers']:
+env.Tool('x11')
+
+if True:
     env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
-    sources += ['xlib_softpipe.c', 'xlib_sw_winsys.c']
-    drivers += [softpipe]
+    env.Prepend(LIBS = [softpipe])
 
-if 'llvmpipe' in env['drivers']:
-    env.Tool('llvm')
-    if 'LLVM_VERSION' in env:
-        env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
-        env.Tool('udis86')
-        sources += ['xlib_llvmpipe.c', 'xlib_sw_winsys.c']
-        drivers += [llvmpipe]
+if env['llvm']:
+    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
+    env.Tool('udis86')
+    env.Prepend(LIBS = [llvmpipe])
     
 if 'cell' in env['drivers']:
     env.Append(CPPDEFINES = 'GALLIUM_CELL')
-    sources += ['xlib_cell.c']
-    drivers += [cell]
+    env.Prepend(LIBS = [cell])
 
 # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
 libgl = env.SharedLibrary(
     target ='GL',
     source = sources,
-    LIBS = st_xlib + glapi + mesa + glsl + drivers + gallium + env['LIBS'],
 )
 
 if not env['dri']: