diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-12 16:57:31 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-22 23:05:58 +0100 |
| commit | f85e7ce057afc8d31ae78ad85cb41600c18615a0 (patch) | |
| tree | e811d4d84a460215390b7ad9606c5367750ab048 /src/gallium/targets/vdpau | |
| parent | 9df2c4956b6fc4fff1497923d42011c16e777322 (diff) | |
| download | external_mesa3d-f85e7ce057afc8d31ae78ad85cb41600c18615a0.zip external_mesa3d-f85e7ce057afc8d31ae78ad85cb41600c18615a0.tar.gz external_mesa3d-f85e7ce057afc8d31ae78ad85cb41600c18615a0.tar.bz2 | |
targets/r600/vdpau: convert to static/shared pipe-drivers
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 <christian.koenig@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Diffstat (limited to 'src/gallium/targets/vdpau')
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 19 |
1 files changed, 19 insertions, 0 deletions
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) |