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 b8b577fe5ac5bf04a843a703aa3d8ae30ec43da1..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',
@@ -11,33 +15,30 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_bld_alpha.c',
                'lp_bld_arit.c',
                'lp_bld_blend_aos.c',
+               'lp_bld_blend_logicop.c',
                'lp_bld_blend_soa.c',
                'lp_bld_const.c',
                'lp_bld_conv.c',
                '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_logicop.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',
                'lp_flush.c',
+               'lp_jit.c',
                'lp_prim_setup.c',
                'lp_prim_vbuf.c',
                'lp_setup.c',
-               'lp_quad_blend.c',
-               'lp_quad_pipe.c',
-               'lp_quad_fs.c',
-               'lp_quad_stipple.c',
                'lp_query.c',
                'lp_screen.c',
                'lp_state_blend.c',
@@ -48,6 +49,7 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_state_sampler.c',
                'lp_state_surface.c',
                'lp_state_vertex.c',
+               'lp_state_vs.c',
                'lp_surface.c',
                'lp_tex_cache.c',
                'lp_tex_sample.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(