From 142e288b1787163af68d2fcf0faae6d672510ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Wed, 18 Sep 2013 20:16:27 +0200 Subject: [PATCH] macosx: fix linking the motion and rotate modules Signed-off-by: Jean-Baptiste Kempf --- configure.ac | 1 - modules/control/Modules.am | 3 +++ modules/video_filter/Modules.am | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e169dd12cb..48e944f062 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,6 @@ case "${host_os}" in CPPFLAGS="${CPPFLAGS} ${ARCH_flag}" OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" - VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration]) diff --git a/modules/control/Modules.am b/modules/control/Modules.am index d90628e696..13cf7ace6a 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -16,6 +16,9 @@ noinst_LTLIBRARIES = libvlc_motion.la libmotion_plugin_la_SOURCES = motion.c libmotion_plugin_la_LIBADD = libvlc_motion.la +if HAVE_DARWIN +libmotion_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation +endif control_LTLIBRARIES += \ libdummy_plugin.la \ diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index abd1c765b6..a913e5b20b 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -68,6 +68,9 @@ SOURCES_opencv_example = opencv_example.cpp filter_event_info.h librotate_plugin_la_SOURCES = rotate.c librotate_plugin_la_LIBADD = ../control/libvlc_motion.la $(LIBM) +if HAVE_DARWIN +librotate_plugin_la_LDFLAGS = -Wl,-framework,IOKit,-framework,CoreFoundation +endif video_filter_LTLIBRARIES += librotate_plugin.la SOURCES_colorthres = colorthres.c