]> git.sesse.net Git - vlc/commitdiff
macosx: fix linking the motion and rotate modules
authorFelix Paul Kühne <fkuehne@videolan.org>
Wed, 18 Sep 2013 18:16:27 +0000 (20:16 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 19 Sep 2013 13:11:58 +0000 (15:11 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac
modules/control/Modules.am
modules/video_filter/Modules.am

index e169dd12cbdd3b05fe0a56e788df2ad06921f941..48e944f0623a77704c23d4453445032c2e16bb46 100644 (file)
@@ -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])
index d90628e696bfc16a86c52b0dad63f2ca63d94bd4..13cf7ace6ae2331324096125e806ddecead502b5 100644 (file)
@@ -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 \
index abd1c765b62eddbfd423fa102615ed438a2d07c1..a913e5b20b6f7ee55cfc4c784ba70b27e4c8dd4c 100644 (file)
@@ -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