From 291d70210dd249c663f8c3b92ac9cf47335630bd Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 21 Jun 2014 12:31:47 +0100 Subject: targets/radeonsi/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 commits, 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/gallium/targets/vdpau') diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index b30d1939cc5..a257db87c28 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -50,9 +50,14 @@ endif # Radeon winsys chaos if HAVE_GALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +else +if HAVE_GALLIUM_RADEONSI STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la endif +endif if HAVE_GALLIUM_RADEON_COMMON STATIC_TARGET_LIB_DEPS += \ @@ -67,6 +72,14 @@ STATIC_TARGET_LIB_DEPS += \ $(RADEON_LIBS) endif +if HAVE_GALLIUM_RADEONSI +MEGADRIVERS += radeonsi +STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.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.2.3