vlc | branch: master | Thomas Guillem <[email protected]> | Wed May 27 11:27:28 2020 +0200| [c03ab9f5755dcd873c9a8c6f5aba8e86c2c010bc] | committer: Hugo Beauzée-Luyssen
codec: put hxxx_helper in a static lib Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c03ab9f5755dcd873c9a8c6f5aba8e86c2c010bc --- modules/codec/Makefile.am | 29 +++++++++++++++-------------- modules/hw/nvdec/Makefile.am | 8 ++------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 142c647839..f544dd9a5b 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -338,13 +338,7 @@ EXTRA_LTLIBRARIES += liboggspots_plugin.la codec_LTLIBRARIES += $(LTLIBoggspots) libvideotoolbox_plugin_la_SOURCES = \ - codec/vt_utils.c codec/vt_utils.h \ - codec/videotoolbox.c codec/hxxx_helper.c codec/hxxx_helper.h \ - packetizer/hxxx_nal.h packetizer/hxxx_nal.c \ - packetizer/hxxx_sei.h packetizer/hxxx_sei.c \ - packetizer/h264_slice.c packetizer/h264_slice.h \ - packetizer/h264_nal.c packetizer/h264_nal.h \ - packetizer/hevc_nal.c packetizer/hevc_nal.h + codec/vt_utils.c codec/vt_utils.h codec/videotoolbox.c libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS) if HAVE_IOS libvideotoolbox_plugin_la_CFLAGS += -miphoneos-version-min=9.0 @@ -352,7 +346,7 @@ endif if HAVE_TVOS libvideotoolbox_plugin_la_CFLAGS += -mtvos-version-min=10.2 endif -libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la +libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la codec_LTLIBRARIES += $(LTLIBvideotoolbox) @@ -475,12 +469,8 @@ libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacodec.h \ codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \ codec/omxil/omxil_utils.h codec/omxil/qcom.c codec/omxil/qcom.h \ - video_output/android/utils.c video_output/android/utils.h \ - codec/hxxx_helper.c codec/hxxx_helper.h \ - packetizer/hxxx_nal.h packetizer/hxxx_nal.c \ - packetizer/h264_nal.c packetizer/h264_nal.h \ - packetizer/hevc_nal.c packetizer/hevc_nal.h -libmediacodec_plugin_la_LIBADD = libchroma_copy.la + video_output/android/utils.c video_output/android/utils.h +libmediacodec_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la codec_LTLIBRARIES += $(LTLIBomxil) EXTRA_LTLIBRARIES += libomxil_plugin.la if HAVE_ANDROID @@ -612,3 +602,14 @@ libgstdecode_plugin_la_LIBADD = $(GST_VIDEO_LIBS) $(GST_APP_LIBS) if HAVE_GST_DECODE codec_LTLIBRARIES += libgstdecode_plugin.la endif + +libvlc_hxxxhelper_la_SOURCES = \ + codec/hxxx_helper.c codec/hxxx_helper.h \ + packetizer/hxxx_nal.h packetizer/hxxx_nal.c \ + packetizer/hxxx_sei.h packetizer/hxxx_sei.c \ + packetizer/h264_slice.c packetizer/h264_slice.h \ + packetizer/h264_nal.c packetizer/h264_nal.h \ + packetizer/hevc_nal.c packetizer/hevc_nal.h +libvlc_hxxxhelper_la_CPPFLAGS = -Dneedsomethinghere +libvlc_hxxxhelper_la_LDFLAGS = -static +EXTRA_LTLIBRARIES += libvlc_hxxxhelper.la diff --git a/modules/hw/nvdec/Makefile.am b/modules/hw/nvdec/Makefile.am index de5fba03ab..74cdea9af3 100644 --- a/modules/hw/nvdec/Makefile.am +++ b/modules/hw/nvdec/Makefile.am @@ -1,12 +1,8 @@ nvdecdir = $(pluginsdir)/nvdec libnvdec_plugin_la_SOURCES = \ - hw/nvdec/nvdec.c codec/hxxx_helper.c codec/hxxx_helper.h \ - packetizer/hxxx_nal.h packetizer/hxxx_nal.c \ - packetizer/h264_nal.c packetizer/h264_nal.h \ - packetizer/hevc_nal.c packetizer/hevc_nal.h \ - hw/nvdec/nvdec_fmt.h -libnvdec_plugin_la_LIBADD = $(LIBDL) + hw/nvdec/nvdec.c hw/nvdec/nvdec_fmt.h +libnvdec_plugin_la_LIBADD = $(LIBDL) libvlc_hxxxhelper.la if HAVE_NVDEC codec_LTLIBRARIES += libnvdec_plugin.la endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
