X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2FSConscript;h=26b258b956957cac81a0f71788980928461f4850;hb=601498ae73e654c2de997ea75075613a694d604d;hp=a39283e5e869d1b0d4f4e46bc407e6b1f06644c7;hpb=c61bf363937f40624a5632745630d4f2b9907082;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index a39283e5e86..26b258b9569 100644
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -1,13 +1,13 @@
-Import('*')
+from sys import executable as python_cmd
+import distutils.version
 
-env = env.Clone()
+Import('*')
 
-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.Tool('udis86')
+env = env.Clone()
 
 env.Append(CPPPATH = ['.'])
 
@@ -15,22 +15,39 @@ env.CodeGenerate(
 	target = 'lp_tile_soa.c',
 	script = 'lp_tile_soa.py',
 	source = ['#src/gallium/auxiliary/util/u_format.csv'],
-	command = 'python $SCRIPT $SOURCE > $TARGET'
+	command = python_cmd + ' $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', 
+])
+
+
+lp_tile_soa_os = env.SharedObject('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',
 		'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',
@@ -44,17 +61,23 @@ llvmpipe = env.ConvenienceLibrary(
 		'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_llvm.c',
+		'lp_tex_sample.c',
 		'lp_texture.c',
-		'lp_tile_soa.c',
+		'lp_tile_image.c',
+        lp_tile_soa_os,
 	])
 
+env.Alias('llvmpipe', llvmpipe)
+
 
 if env['platform'] != 'embedded':
     env = env.Clone()
@@ -65,8 +88,13 @@ if env['platform'] != 'embedded':
         'format',
         'blend',
         'conv',
+	'printf',
+	'sincos',
     ]
 
+    if not env['msvc']:
+        tests.append('round')
+
     for test in tests:
         target = env.Program(
             target = 'lp_test_' + test,
@@ -74,4 +102,4 @@ if env['platform'] != 'embedded':
         )
         env.InstallProgram(target)
 
-    Export('llvmpipe')
+Export('llvmpipe')