vlc | branch: master | Steve Lhomme <[email protected]> | Sat Nov 11 19:06:22 2017 +0100| [32d236c6264263361febc9f80d6d0bf48309befd] | committer: Jean-Baptiste Kempf
deinterlace: move the common code between modules in a static library Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32d236c6264263361febc9f80d6d0bf48309befd --- modules/video_filter/Makefile.am | 5 ++++- modules/video_output/Makefile.am | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am index 60f17d024b..e0007017b5 100644 --- a/modules/video_filter/Makefile.am +++ b/modules/video_filter/Makefile.am @@ -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 diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index ee7e150abd..610b0f920c 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -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)' _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
