From f85e7ce057afc8d31ae78ad85cb41600c18615a0 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 12 Jun 2014 16:57:31 +0100 Subject: targets/r600/vdpau: convert to static/shared pipe-drivers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Similar to previous commit, this allows us to minimise some of the duplication by compacting all vdpau targets into a single library. v2: Include the radeon winsys only when there is a user for it. v3: Correcly include the winsys. Now with extra brown bag :\ Cc: Christian König Signed-off-by: Emil Velikov Reviewed-by: Christian König Tested-by: Thomas Helland --- src/gallium/targets/vdpau/Makefile.am | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/gallium/targets/vdpau') diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 23de1c9..b30d193 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -48,6 +48,25 @@ STATIC_TARGET_LIB_DEPS += \ $(NOUVEAU_LIBS) endif +# Radeon winsys chaos +if HAVE_GALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +endif + +if HAVE_GALLIUM_RADEON_COMMON +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la +endif + +if HAVE_GALLIUM_R600 +MEGADRIVERS += r600 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) +endif + libvdpau_gallium_la_SOURCES += target.c libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) -- cgit v1.1