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 3ca676647c7df2742aa10f91f2df30d4a2d1f162..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 = ['.'])
@@ -18,43 +17,39 @@ env.CodeGenerate(
        command = 'python $SCRIPT $SOURCE > $TARGET'
 )
 
+# XXX: Our dependency scanner only finds depended modules in relative dirs.
+env.Depends('lp_tile_soa.c', [
+    '#src/gallium/auxiliary/util/u_format_parse.py', 
+    '#src/gallium/auxiliary/util/u_format_pack.py', 
+])
+
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
        source = [
                '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_format_query.c',
-               'lp_bld_format_soa.c',
                'lp_bld_interp.c',
-               'lp_bld_intr.c',
-               'lp_bld_misc.cpp',
-        'lp_bld_pack.c',
-        'lp_bld_sample.c',
-               'lp_bld_sample_soa.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',
+               'lp_fence.c',
                'lp_flush.c',
                'lp_jit.c',
-               'lp_prim_vbuf.c',
-               'lp_setup.c',
+               'lp_perf.c',
                'lp_query.c',
+               'lp_rast.c',
+               'lp_rast_tri.c',
+               'lp_scene.c',
+               'lp_scene_queue.c',
                'lp_screen.c',
+               'lp_setup.c',
+               'lp_setup_line.c',
+               'lp_setup_point.c',
+               'lp_setup_tri.c',
+               'lp_setup_vbuf.c',
                'lp_state_blend.c',
                'lp_state_clip.c',
                'lp_state_derived.c',
@@ -65,30 +60,28 @@ llvmpipe = env.ConvenienceLibrary(
                'lp_state_vertex.c',
                'lp_state_vs.c',
                'lp_surface.c',
-               'lp_tex_cache.c',
-               'lp_tex_sample_c.c',
                'lp_tex_sample_llvm.c',
                'lp_texture.c',
-               'lp_tile_cache.c',
+               'lp_tile_image.c',
                'lp_tile_soa.c',
        ])
 
 
-env = env.Clone()
+if env['platform'] != 'embedded':
+    env = env.Clone()
 
-env.Prepend(LIBS = [llvmpipe] + gallium)
+    env.Prepend(LIBS = [llvmpipe] + gallium)
 
-tests = [
-    'format',
-    'blend',
-    'conv',
-]
+    tests = [
+        'blend',
+        'conv',
+    ]
 
-for test in tests:
-    target = env.Program(
-        target = 'lp_test_' + test,
-        source = ['lp_test_' + test + '.c', 'lp_test_main.c'],
-    )
-    env.InstallProgram(target)
+    for test in tests:
+        target = env.Program(
+            target = 'lp_test_' + test,
+            source = ['lp_test_' + test + '.c', 'lp_test_main.c'],
+        )
+        env.InstallProgram(target)
 
-Export('llvmpipe')
+    Export('llvmpipe')