llvmpipe, gallivm: implement lod queries (LODQ opcode)

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

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index a81cf231a995a6a4854ad70b85babbdacdb86d12..fbbd22a52999bde27f7df429a4ed13d37dfce814 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -9,52 +9,12 @@ if not env['llvm']:
 
 env = env.Clone()
 
+env.MSVC2013Compat()
+
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
-       source = [
-               'lp_bld_alpha.c',
-               'lp_bld_blend.c',
-               'lp_bld_blend_aos.c',
-               'lp_bld_blend_logicop.c',
-               'lp_bld_depth.c',
-               'lp_bld_interp.c',
-               'lp_clear.c',
-               'lp_context.c',
-               'lp_draw_arrays.c',
-               'lp_fence.c',
-               'lp_flush.c',
-               'lp_jit.c',
-               'lp_memory.c',
-               'lp_perf.c',
-               'lp_query.c',
-               'lp_rast.c',
-               'lp_rast_debug.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',
-               'lp_state_fs.c',
-               'lp_state_setup.c',
-               'lp_state_gs.c',
-               'lp_state_rasterizer.c',
-               'lp_state_sampler.c',
-                'lp_state_so.c',
-               'lp_state_surface.c',
-               'lp_state_vertex.c',
-               'lp_state_vs.c',
-               'lp_surface.c',
-               'lp_tex_sample.c',
-               'lp_texture.c',
-               'lp_tile_image.c',
-       ])
+       source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+       )
 
 env.Alias('llvmpipe', llvmpipe)
 
@@ -62,28 +22,22 @@ env.Alias('llvmpipe', llvmpipe)
 if not env['embedded']:
     env = env.Clone()
 
-    env.Prepend(LIBS = [llvmpipe] + gallium)
+    env.Prepend(LIBS = [llvmpipe, gallium, mesautil])
 
     tests = [
+        'arit',
         'format',
         'blend',
         'conv',
         'printf',
     ]
 
-    if not env['msvc']:
-        tests.append('arit')
-
     for test in tests:
         testname = 'lp_test_' + test
         target = env.Program(
             target = testname,
             source = [testname + '.c', 'lp_test_main.c'],
         )
-        env.InstallProgram(target)
-        
-        # http://www.scons.org/wiki/UnitTests
-        alias = env.Alias(testname, [target], target[0].abspath)
-        AlwaysBuild(alias)
+        env.UnitTest(testname, target)
 
 Export('llvmpipe')