Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / SConscript

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index f4ab8a50da46f7eccb7bb5eaa98d2872791e0d72..84519cfd048470dec3e0ff3588360c0e20234784 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -157,6 +157,7 @@ source = [
     'util/u_draw_quad.c',
     'util/u_format.c',
     'util/u_format_other.c',
+    'util/u_format_latc.c',
     'util/u_format_s3tc.c',
     'util/u_format_rgtc.c',
     'util/u_format_srgb.c',
@@ -177,6 +178,7 @@ source = [
     'util/u_network.c',
     'util/u_math.c',
     'util/u_mm.c',
+    'util/u_pstipple.c',
     'util/u_rect.c',
     'util/u_resource.c',
     'util/u_ringbuffer.c',
@@ -199,16 +201,13 @@ source = [
 ]
 
 if env['llvm']:
-    if env['UDIS86']:
-        env.Append(CPPDEFINES = [('HAVE_UDIS86', '1')])
-
     source += [
         'gallivm/lp_bld_arit.c',
         'gallivm/lp_bld_assert.c',
         'gallivm/lp_bld_bitarit.c',
         'gallivm/lp_bld_const.c',
         'gallivm/lp_bld_conv.c',
-        'gallivm/lp_bld_debug.c',
+        'gallivm/lp_bld_debug.cpp',
         'gallivm/lp_bld_flow.c',
         'gallivm/lp_bld_format_aos.c',
         'gallivm/lp_bld_format_soa.c',