Commit af316abf authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

macOS: factor out the Frameworks path definitions

parent ccfd8211
......@@ -38,7 +38,7 @@ vlc_osx_SOURCES = darwinvlc.m
vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa
if HAVE_BREAKPAD
vlc_osx_LDFLAGS += -Wl,-framework,Breakpad
vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)
vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)/Frameworks
endif
vlc_osx_LDADD = ../lib/libvlc.la
......@@ -51,7 +51,7 @@ vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static
vlc_osx_static_LDADD = $(vlc_osx_LDADD)
if HAVE_BREAKPAD
vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad
vlc_osx_static_OBJCFLAGS += -F$(CONTRIB_DIR)
vlc_osx_static_OBJCFLAGS += -F$(CONTRIB_DIR)/Frameworks
endif
endif
......
......@@ -426,7 +426,7 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include -F${CONTRIB_DIR} -F${CONTRIB_DIR}/Frameworks"
export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
......@@ -4134,8 +4134,7 @@ AS_IF([test "${enable_osx_notifications}" != "no"], [
if test ! -d ${CONTRIB_DIR}/Growl.framework -a ! -d ${CONTRIB_DIR}/Frameworks/Growl.framework
then
VLC_ADD_PLUGIN([osx_notifications])
VLC_ADD_LIBS([osx_notifications], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,Foundation])
VLC_ADD_OBJCFLAGS([osx_notifications], [-F${CONTRIB_DIR}])
VLC_ADD_LIBS([osx_notifications], [-Wl,-framework,Growl,-framework,Foundation])
VLC_ADD_OBJCFLAGS([osx_notifications], [-fobjc-exceptions] )
fi
])
......
......@@ -4,13 +4,13 @@ guidir = $(pluginsdir)/gui
SUFFIXES += .xib .nib
libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc -F${CONTRIB_DIR}
libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc
libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices \
-Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,IOKit \
-Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio \
-Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge \
-F${CONTRIB_DIR} -Wl,-framework,QuartzCore
-Wl,-framework,QuartzCore
if HAVE_SPARKLE
libmacosx_plugin_la_LDFLAGS += -Wl,-framework,Sparkle
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment