Browse Source

package : fix automake iOS build compatibility

Maxime Chapelet 4 years ago
committed by Alexandre Janniaux
parent
commit
b8f16a857a
  1. 2
      extras/package/apple/build.conf
  2. 10
      modules/static.mk
  3. 6
      src/Makefile.am

2
extras/package/apple/build.conf

@ -13,7 +13,7 @@
# macOS deployment target
export VLC_DEPLOYMENT_TARGET_MACOSX="10.11"
# iOS deployment target
export VLC_DEPLOYMENT_TARGET_IOS="9.0"
export VLC_DEPLOYMENT_TARGET_IOS="10.0"
# tvOS deployment target
export VLC_DEPLOYMENT_TARGET_TVOS="11.0"

10
modules/static.mk

@ -115,15 +115,17 @@ libvlc_plugin_la_LDFLAGS = \
if HAVE_TVOS
libvlc_plugin_la_LDFLAGS += $(libvlc_plugin_frameworks)
endif
if HAVE_IOS
libvlc_plugin_la_LDFLAGS += $(libvlc_plugin_frameworks)
endif
libvlc_plugin_la_LIBADD = $(PARTIAL_PLUGINS)
EXTRA_libvlc_plugin_la_DEPENDENCIES = vlc_modules_manifest.h ../src/vlccore.framework/vlccore
if HAVE_IOS
libvlc_plugin_la_LDFLAGS += -avoid-version
endif
if HAVE_TVOS
if HAVE_DARWIN
if !HAVE_OSX
libvlc_plugin_la_LDFLAGS += -avoid-version -Xlinker -install_name -Xlinker @rpath/vlc_plugin.framework/vlc_plugin
endif
endif
if HAVE_OSX
libvlc_plugin_la_LDFLAGS += \

6
src/Makefile.am

@ -583,10 +583,10 @@ $(libvlccore_la_OBJECTS): libvlccore_objc.la libvlc_darwin.la
libvlccore_objc_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
libvlccore_objc_la_LDFLAGS = -static
libvlccore_la_LIBADD += libvlccore_objc.la libvlc_darwin.la
if HAVE_TVOS
libvlccore_la_LDFLAGS += -Wl,-framework,Foundation -Xlinker -install_name -Xlinker @rpath/vlccore.framework/vlccore
else
if HAVE_OSX
libvlccore_la_LDFLAGS += -Wl,-framework,Foundation -Xlinker -install_name -Xlinker @rpath/libvlccore.dylib
else
libvlccore_la_LDFLAGS += -Wl,-framework,Foundation -Xlinker -install_name -Xlinker @rpath/vlccore.framework/vlccore
endif
endif

Loading…
Cancel
Save