Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
05332465
Commit
05332465
authored
Sep 22, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
projectM: avoid genmf
Also do not define unused PROJECTM2_(CFLAGS|LIBS) substitutions.
parent
bd17d395
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
configure.ac
configure.ac
+1
-3
modules/visualization/Modules.am
modules/visualization/Modules.am
+6
-1
No files found.
configure.ac
View file @
05332465
...
@@ -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] )
])
])
...
...
modules/visualization/Modules.am
View file @
05332465
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 \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment