Merge commit 'origin/7.8'

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

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 0015ccd715c3987e4b0536547ecc40e6fabca0f7..c4d6b528b7c9cb64df2852ddf15ebd59fe758a1b 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -106,11 +106,13 @@ C_SOURCES = \
        util/u_dl.c \
        util/u_draw_quad.c \
        util/u_format.c \
+       util/u_format_other.c \
        util/u_format_s3tc.c \
        util/u_format_srgb.c \
        util/u_format_table.c \
        util/u_format_tests.c \
        util/u_format_yuv.c \
+       util/u_format_zs.c \
        util/u_gen_mipmap.c \
        util/u_half.c \
        util/u_handle_table.c \
@@ -129,9 +131,9 @@ C_SOURCES = \
        util/u_surface.c \
        util/u_texture.c \
        util/u_tile.c \
-       util/u_timed_winsys.c \
+       util/u_transfer.c \
+       util/u_resource.c \
        util/u_upload_mgr.c \
-       util/u_simple_screen.c \
        target-helpers/wrap_screen.c
 
        # Disabling until pipe-video branch gets merged in