vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jan 21 18:09:40 2016 +0100| [b160086a77cfcf1e14d73b6472b86e6574e177e6] | committer: Rémi Denis-Courmont
decklink: fix the CXXFLAGS overriding Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b160086a77cfcf1e14d73b6472b86e6574e177e6 --- modules/access/Makefile.am | 2 +- modules/video_output/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am index 6751bb3..eaff89d 100644 --- a/modules/access/Makefile.am +++ b/modules/access/Makefile.am @@ -155,7 +155,7 @@ access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi) EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la libdecklink_plugin_la_SOURCES = access/decklink.cpp access/sdi.c access/sdi.h -libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink) +libdecklink_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CPPFLAGS_decklink) libdecklink_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread if HAVE_DECKLINK access_LTLIBRARIES += libdecklink_plugin.la diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am index 896791c..83a26e1 100644 --- a/modules/video_output/Makefile.am +++ b/modules/video_output/Makefile.am @@ -5,7 +5,7 @@ EXTRA_DIST += video_output/README if HAVE_DECKLINK libdecklinkoutput_plugin_la_SOURCES = video_output/decklink.cpp -libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput) +libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CPPFLAGS_decklinkoutput) libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL) -lpthread vout_LTLIBRARIES += libdecklinkoutput_plugin.la endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
