vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 13:29:58 2012 +0300| [afc1d0221aee709df07ded0194c1851739c48f44] | committer: Rémi Denis-Courmont
Remove recursion into modules/video_filter/dynamicoverlay/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=afc1d0221aee709df07ded0194c1851739c48f44 --- configure.ac | 10 ---------- modules/video_filter/Modules.am | 14 ++++++++++++-- modules/video_filter/dynamicoverlay/Modules.am | 2 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index e47b797..e75a6c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1052,15 +1052,6 @@ dnl ALIASES="${ALIASES} cvlc rvlc" dnl -dnl Some plugins aren't useful on some platforms -dnl -if test "${SYS}" != "mingw32"; then - VLC_ADD_PLUGIN([dynamicoverlay]) -elif test "${SYS}" = "darwin"; then - VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) -fi - -dnl dnl Accelerated modules dnl @@ -4134,7 +4125,6 @@ AC_CONFIG_FILES([ modules/text_renderer/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile - modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/visualization/Makefile modules/mmx/Makefile diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 54aec56..3072e55 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -1,5 +1,3 @@ -SUBDIRS = dynamicoverlay - SOURCES_mosaic = mosaic.c mosaic.h SOURCES_transform = transform.c SOURCES_invert = invert.c @@ -36,6 +34,18 @@ libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM endif libvlc_LTLIBRARIES += libdeinterlace_plugin.la +libdynamicoverlay_plugin_la_SOURCES = \ + dynamicoverlay/dynamicoverlay_buffer.c \ + dynamicoverlay/dynamicoverlay_queue.c \ + dynamicoverlay/dynamicoverlay_list.c \ + dynamicoverlay/dynamicoverlay_commands.c \ + dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h +libdynamicoverlay_plugin_la_CFLAGS = $(AM_CFLAGS) +libdynamicoverlay_plugin_la_LIBADD = $(AM_LIBADD) +if !HAVE_WIN32 +libvlc_LTLIBRARIES += libdynamicoverlay_plugin.la +endif + libosdmenu_plugin_la_SOURCES = osdmenu.c libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\" libosdmenu_plugin_la_LIBADD = $(AM_LIBADD) diff --git a/modules/video_filter/dynamicoverlay/Modules.am b/modules/video_filter/dynamicoverlay/Modules.am deleted file mode 100644 index 5f645e4..0000000 --- a/modules/video_filter/dynamicoverlay/Modules.am +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES_dynamicoverlay = dynamicoverlay_buffer.c dynamicoverlay_queue.c dynamicoverlay_list.c dynamicoverlay_commands.c dynamicoverlay.c -noinst_HEADERS = dynamicoverlay.h _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
