Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

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

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 02af4d9280a69835bef04611eccc30da3a1d6e9f..05096b12a86f984c55e1f4abb6f20bf732910d3a 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -143,14 +143,11 @@ C_SOURCES = \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \

-       target-helpers/wrap_screen.c
-
-       # Disabling until pipe-video branch gets merged in
-       #vl/vl_bitstream_parser.c \
-       #vl/vl_mpeg12_mc_renderer.c \
-       #vl/vl_compositor.c \
-       #vl/vl_csc.c \
-       #vl/vl_shader_build.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

 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_arit.c \
 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_arit.c \