Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

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

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index ec82be14c8a9f63d75cf8acbb12f7c2f549ecf40..5c29bdac56e852f7f4452114ce7e04f7b4c7b585 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -2,8 +2,12 @@ Import('*')
 
 env = env.Clone()
 
+env.Tool('llvm')
+if 'LLVM_VERSION' not in env:
+    print 'warning: LLVM not found: not building llvmpipe'
+    Return()
+
 env.Tool('udis86')
-env.ParseConfig('llvm-config --cppflags')
 
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
@@ -18,17 +22,15 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_bld_debug.c',
                'lp_bld_depth.c',
                'lp_bld_flow.c',
+               'lp_bld_format_aos.c',
                'lp_bld_interp.c',
                'lp_bld_intr.c',
-               'lp_bld_pack.c',
-               'lp_bld_unpack.c',
-               'lp_bld_load.c',
-               'lp_bld_store.c',
                'lp_bld_struct.c',
                'lp_bld_logic.c',
                'lp_bld_swizzle.c',
                'lp_bld_tgsi_soa.c',            
                'lp_bld_type.c',
+               'lp_buffer.c',
                'lp_clear.c',
                'lp_context.c',
                'lp_draw_arrays.c',
@@ -59,8 +61,6 @@ llvmpipe = env.ConvenienceLibrary(
 
 env = env.Clone()
 
-env['LINK'] = env['CXX']
-env.ParseConfig('llvm-config --libs jit interpreter nativecodegen bitwriter')
 env.Prepend(LIBS = [llvmpipe] + auxiliaries)
 
 env.Program(