From 47a89e9255846f55efe0992c94b65ae7c911dbb3 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Sat, 10 Apr 2010 03:01:30 +0100 Subject: scons: Always build softpipe and llvmpipe (when llvm available). These are our reference software rasterizers. They can build everywhere and are a precious debugging tool. Making them always present immensily simplifies the scons logic. If people want to avoid building it is still possible to pass direcotries and target names to scons to narrow the build. --- src/gallium/targets/libgl-xlib/SConscript | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/gallium/targets/libgl-xlib') diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 0d2ffd2070..63e4531263 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 = [ @@ -45,11 +41,11 @@ sources = [ env.Tool('x11') -if 'softpipe' in env['drivers']: +if True: env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE') env.Prepend(LIBS = [softpipe]) -if 'llvmpipe' in env['drivers']: +if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Tool('udis86') env.Prepend(LIBS = [llvmpipe]) -- cgit v1.2.3