From 06df19ba15a8073651e2ad4c610b684f123f2447 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 21 Nov 2017 15:03:53 +0100 Subject: [PATCH] direct3d11: link with d3d11 on Winstore builds It's not implied by libd3d11_common Signed-off-by: Jean-Baptiste Kempf --- modules/video_chroma/Makefile.am | 3 +++ modules/video_output/Makefile.am | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index cb71b3315c..53e7337765 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -129,6 +129,9 @@ endif # D3D11VA libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c libd3d11_surface_plugin_la_LIBADD = libchroma_copy.la libd3d11_common.la +if HAVE_WINSTORE +libd3d11_surface_plugin_la_LIBADD += -ld3d11 +endif if HAVE_AVCODEC_D3D11VA chroma_LTLIBRARIES += \ diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index ddaad003d2..29075e9f88 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -281,6 +281,7 @@ libdirect3d11_plugin_la_SOURCES += video_output/win32/events.c \ video_output/win32/win32touch.c video_output/win32/win32touch.h libdirect3d11_plugin_la_LIBADD += -lgdi32 else +libdirect3d11_plugin_la_LIBADD += -ld3d11 libdirect3d11_plugin_la_LIBADD += -ld3dcompiler_47 endif libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' @@ -290,9 +291,15 @@ EXTRA_LTLIBRARIES += libdirect3d11_plugin.la libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d11_deinterlace_plugin_la_LIBADD = libdeinterlace_common.la libd3d11_common.la +if HAVE_WINSTORE +libdirect3d11_deinterlace_plugin_la_LIBADD += -ld3d11 +endif libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d11_adjust_plugin_la_LIBADD = libd3d11_common.la +if HAVE_WINSTORE +libdirect3d11_adjust_plugin_la_LIBADD += -ld3d11 +endif video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust) EXTRA_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la -- 2.11.4.GIT