vlc | branch: master | Alexandre Janniaux <aja...@videolabs.io> | Mon May 4 11:44:30 2020 +0200| [1b9a3f4687292d7393c08b72bf879acee487f246] | committer: Alexandre Janniaux
video_output: Makefile.am: fix link for interop_cvpx on ios There were no LDFLAGS for iOS/tvOS and vt_utils were not compiled but linking worked because videotoolbox was linked in the final static library archive. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1b9a3f4687292d7393c08b72bf879acee487f246 --- modules/video_output/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 120601b0d8..8e7bdf36fb 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -41,7 +41,9 @@ endif libglinterop_cvpx_plugin_la_SOURCES = video_output/opengl/interop_cvpx.c \ video_output/opengl/interop.h -libglinterop_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' +libglinterop_cvpx_plugin_la_SOURCES += codec/vt_utils.c codec/vt_utils.h +libglinterop_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ + -Wl,-framework,Foundation,-framework,CoreVideo if HAVE_OSX libvout_macosx_plugin_la_SOURCES = video_output/macosx.m $(OPENGL_COMMONSOURCES) @@ -56,9 +58,7 @@ libcaopengllayer_plugin_la_LIBADD = $(OPENGL_COMMONLIBS) libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \ -Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore -libglinterop_cvpx_plugin_la_SOURCES += codec/vt_utils.c codec/vt_utils.h -libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,IOSurface \ - -Wl,-framework,Foundation,-framework,CoreVideo,-framework,OpenGL +libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,IOSurface,-framework,OpenGL vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la \ libglinterop_cvpx_plugin.la endif _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
