vlc | branch: master | Rafaël Carré <[email protected]> | Fri Dec 7 17:02:13 2012 +0100| [002d21478ced74bb16224c42107b390c8bf213a8] | committer: Rafaël Carré
decklink: update build rules Move logic to Modules.am Use CXXFLAGS > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=002d21478ced74bb16224c42107b390c8bf213a8 --- configure.ac | 12 +++++++----- modules/access/Modules.am | 8 +++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index dbd27dd..512ee5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1749,17 +1749,19 @@ if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then - VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include]) + VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include]) fi VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}" + CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}" AC_LANG_PUSH(C++) - AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [ - VLC_ADD_PLUGIN([decklink]) - ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)]) + AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [], [ + have_decklink=no + AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled) + ]) AC_LANG_POP(C++) VLC_RESTORE_FLAGS fi +AM_CONDITIONAL(HAVE_DECKLINK, [ test "${have_decklink}" != "no" ]) dnl diff --git a/modules/access/Modules.am b/modules/access/Modules.am index c04485d..d60945f 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -54,11 +54,17 @@ SOURCES_access_avio = avio.c avio.h ../codec/avcodec/cpu.c SOURCES_access_attachment = attachment.c SOURCES_access_vdr = vdr.c SOURCES_libbluray = bluray.c -SOURCES_decklink = decklink.cpp SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c +if HAVE_DECKLINK +libdecklink_plugin_la_SOURCES = decklink.cpp +libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklink) +libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl +libvlc_LTLIBRARIES += libdecklink_plugin.la +endif + if HAVE_QTKIT libqtcapture_plugin_la_SOURCES = qtcapture.m libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
