vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 12:34:59 2012 +0300| [9bc110c4b98d4e680ed03762be1e299e40d48687] | committer: Rémi Denis-Courmont
Remove recursion into modules/visualization/visual/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9bc110c4b98d4e680ed03762be1e299e40d48687 --- configure.ac | 13 +------------ modules/visualization/Modules.am | 10 +++++++++- modules/visualization/visual/Modules.am | 5 ----- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index aa7de91..9257c9c 100644 --- a/configure.ac +++ b/configure.ac @@ -619,7 +619,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -3765,16 +3765,6 @@ fi EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) dnl -dnl Visualisation plugin -dnl -AC_ARG_ENABLE(visual, - [ --enable-visual visualisation plugin (default enabled)]) -if test "${enable_visual}" != "no" -then - VLC_ADD_PLUGIN([visual]) -fi - -dnl dnl goom visualization plugin dnl PKG_ENABLE_MODULES_VLC([GOOM], [], [libgoom2], [goom visualization plugin], [auto]) @@ -4181,7 +4171,6 @@ AC_CONFIG_FILES([ modules/video_output/Makefile modules/video_output/msw/Makefile modules/visualization/Makefile - modules/visualization/visual/Makefile modules/mmx/Makefile modules/sse2/Makefile modules/altivec/Makefile diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am index c6ec29f..af03750 100644 --- a/modules/visualization/Modules.am +++ b/modules/visualization/Modules.am @@ -1,4 +1,12 @@ -SUBDIRS = visual SOURCES_goom = goom.c SOURCES_projectm = projectm.cpp + +libvisual_plugin_la_SOURCES = \ + visual/visual.c visual/visual.h \ + visual/effects.c \ + visual/fft.c visual/fft.h +libvisual_plugin_la_CFLAGS = $(AM_CFLAGS) +libvisual_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) +libvlc_LTLIBRARIES += libvisual_plugin.la + SOURCES_vsxu = vsxu.cpp cyclic_buffer.h diff --git a/modules/visualization/visual/Modules.am b/modules/visualization/visual/Modules.am deleted file mode 100644 index 4f8e67b..0000000 --- a/modules/visualization/visual/Modules.am +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES_visual = visual.c \ - visual.h \ - effects.c \ - fft.c \ - fft.h _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
