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

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

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 49ff1653e0ee65ff599a4427970ff0168c37ef8e..6cf1ddd43fe7aaa9d7039892ad101fc8a0e85087 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -128,12 +128,12 @@ C_SOURCES = \
        util/u_linkage.c \
        util/u_network.c \
        util/u_math.c \
-       util/u_mempool.c \
        util/u_mm.c \
        util/u_rect.c \
        util/u_ringbuffer.c \
        util/u_sampler.c \
        util/u_simple_shaders.c \
+       util/u_slab.c \
        util/u_snprintf.c \
        util/u_staging.c \
        util/u_surface.c \
@@ -143,11 +143,12 @@ C_SOURCES = \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \
-       target-helpers/wrap_screen.c \
        vl/vl_bitstream_parser.c \
        vl/vl_mpeg12_mc_renderer.c \
        vl/vl_compositor.c \
-       vl/vl_csc.c
+       vl/vl_csc.c \
+        vl/vl_idct.c \
+        vl/vl_vertex_buffers.c
 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_arit.c \
@@ -183,7 +184,7 @@ GALLIVM_SOURCES = \
         draw/draw_pt_fetch_shade_pipeline_llvm.c
 
 GALLIVM_CPP_SOURCES = \
-    gallivm/lp_bld_misc.cpp
+       gallivm/lp_bld_misc.cpp
 
 GENERATED_SOURCES = \
        indices/u_indices_gen.c \
@@ -201,9 +202,6 @@ CPP_SOURCES += \
 endif
 
 
-LIBRARY_DEFINES += -D__STDC_CONSTANT_MACROS
-
-
 include ../Makefile.template
 
 
@@ -221,3 +219,4 @@ util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_forma
 
 util/u_half.c: util/u_half.py
        $(PYTHON2) util/u_half.py > $@
+# DO NOT DELETE