Commit 05332465 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

projectM: avoid genmf

Also do not define unused PROJECTM2_(CFLAGS|LIBS) substitutions.
parent bd17d395
...@@ -3903,9 +3903,7 @@ AS_IF([test "${enable_projectm}" != "no"], ...@@ -3903,9 +3903,7 @@ AS_IF([test "${enable_projectm}" != "no"],
PKG_CHECK_MODULES(PROJECTM, libprojectM, PKG_CHECK_MODULES(PROJECTM, libprojectM,
[ [
VLC_ADD_PLUGIN([projectm]) VLC_ADD_PLUGIN([projectm])
VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS]) PKG_CHECK_EXISTS([libprojectM >= 2.0.0],
VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS])
PKG_CHECK_MODULES(PROJECTM2, [libprojectM >= 2.0.0],
[ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM 2.x]) ], [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM 2.x]) ],
[ AC_MSG_WARN( [Using libprojectM version 1] ) [ AC_MSG_WARN( [Using libprojectM version 1] )
]) ])
......
SOURCES_goom = goom.c SOURCES_goom = goom.c
SOURCES_projectm = projectm.cpp
libprojectm_plugin_la_SOURCES = projectm.cpp
libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS)
libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
EXTRA_LTLIBRARIES += libprojectm_plugin.la
visualization_LTLIBRARIES += $(LTLIBprojectm)
libvisual_plugin_la_SOURCES = \ libvisual_plugin_la_SOURCES = \
visual/visual.c visual/visual.h \ visual/visual.c visual/visual.h \
......
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