Browse Source

video_output: Makefile.am: fix link for glconv_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.

Manual backport from commit 1b9a3f4687
since interop_cvpx doesn't exist in 3.0.x and the code was pretty
different.
cherry-pick-c5513cf9
Alexandre Janniaux 4 years ago
parent
commit
4ee99b802d
  1. 15
      modules/video_output/Makefile.am

15
modules/video_output/Makefile.am

@ -20,7 +20,10 @@ endif
libglconv_cvpx_plugin_la_SOURCES = video_output/opengl/converter_cvpx.c \
video_output/opengl/converter.h
libglconv_cvpx_plugin_la_SOURCES += codec/vt_utils.c codec/vt_utils.h
libglconv_cvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libglconv_cvpx_plugin_la_LDFLAGS += -Wl,-framework,IOSurface \
-Wl,-framework,Foundation,-framework,CoreVideo
if HAVE_OSX
libvout_macosx_plugin_la_SOURCES = video_output/macosx.m $(OPENGL_COMMONSOURCES)
@ -35,21 +38,23 @@ libcaopengllayer_plugin_la_LIBADD = $(OPENGL_COMMONLIBS)
libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
-Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
libglconv_cvpx_plugin_la_SOURCES += codec/vt_utils.c codec/vt_utils.h
libglconv_cvpx_plugin_la_LDFLAGS += -Wl,-framework,IOSurface \
-Wl,-framework,Foundation,-framework,CoreVideo,-framework,OpenGL
vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la \
libglconv_cvpx_plugin.la
endif
if HAVE_IOS
if HAVE_OSX
libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS)
libglconv_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
else
libglconv_cvpx_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
libglconv_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
endif
libvout_ios_plugin_la_SOURCES = video_output/ios.m $(OPENGL_COMMONSOURCES)
libvout_ios_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPENGL_COMMONCLFAGS) -DUSE_OPENGL_ES2
libvout_ios_plugin_la_LIBADD = $(OPENGL_COMMONLIBS)
libvout_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit
-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit \
-Wl,-framework,Foundation
if HAVE_IOS
vout_LTLIBRARIES += libvout_ios_plugin.la libglconv_cvpx_plugin.la
endif

Loading…
Cancel
Save