Commit 32d236c6 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

deinterlace: move the common code between modules in a static library

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 65e339de
......@@ -120,10 +120,12 @@ libci_filters_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -miphoneos-version-min=9.0
video_filter_LTLIBRARIES += libci_filters_plugin.la
endif
vlc_deinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h
noinst_LTLIBRARIES += vlc_deinterlace_common.la
libdeinterlace_plugin_la_SOURCES = \
video_filter/deinterlace/deinterlace.c video_filter/deinterlace/deinterlace.h \
video_filter/deinterlace/mmx.h \
video_filter/deinterlace/common.c video_filter/deinterlace/common.h \
video_filter/deinterlace/merge.c video_filter/deinterlace/merge.h \
video_filter/deinterlace/helpers.c video_filter/deinterlace/helpers.h \
video_filter/deinterlace/algo_basic.c video_filter/deinterlace/algo_basic.h \
......@@ -142,6 +144,7 @@ if HAVE_ARM64
libdeinterlace_plugin_la_SOURCES += video_filter/deinterlace/merge_arm64.S
libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM64
endif
libdeinterlace_plugin_la_LIBADD = vlc_deinterlace_common.la
video_filter_LTLIBRARIES += libdeinterlace_plugin.la
libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
......
......@@ -260,9 +260,8 @@ libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
libdirect3d9_plugin_la_LIBADD = video_chroma_copy.la -lgdi32 $(LIBCOM) -luuid
libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c \
video_filter/deinterlace/common.c video_filter/deinterlace/common.h \
video_chroma/d3d9_fmt.h
libdirect3d9_deinterlace_plugin_la_LIBADD = $(LIBCOM)
libdirect3d9_deinterlace_plugin_la_LIBADD = $(LIBCOM) vlc_deinterlace_common.la
libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d9_adjust_plugin_la_SOURCES = video_output/win32/d3d9_adjust.c \
video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
......@@ -294,9 +293,9 @@ vout_LTLIBRARIES += $(LTLIBdirect3d11)
EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c \
video_filter/deinterlace/common.c video_filter/deinterlace/common.h \
video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libdirect3d11_deinterlace_plugin_la_LIBADD = vlc_deinterlace_common.la
libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c \
video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment