Merge branch '7.8'

[mesa.git] / src / gallium / drivers / llvmpipe / SConscript

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 07e6ccfce45a47724ad25ba6184abfbfc987c777..0b827281ff9947278003d2b5473eb1a8757588d1 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -1,12 +1,11 @@
 Import('*')
 
-env = env.Clone()
-
-env.Tool('llvm')
-if not env.has_key('LLVM_VERSION'):
-    print 'warning: LLVM not found: not building llvmpipe'
+if not env['llvm']:
+    print 'warning: LLVM disabled: not building llvmpipe'
     Return()
 
+env = env.Clone()
+
 env.Tool('udis86')
 
 env.Append(CPPPATH = ['.'])
@@ -27,7 +26,12 @@ env.Depends('lp_tile_soa.c', [
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
        source = [
-               'lp_buffer.c',
+               'lp_bld_alpha.c',
+               'lp_bld_blend_aos.c',
+               'lp_bld_blend_logicop.c',
+               'lp_bld_blend_soa.c',
+               'lp_bld_depth.c',
+               'lp_bld_interp.c',
                'lp_clear.c',
                'lp_context.c',
                'lp_draw_arrays.c',