Mercurial > mplayer.hg
changeset 26341:8fadd02c498c
Handle af_ladspa conditional compilation in the usual way.
| author | diego |
|---|---|
| date | Wed, 09 Apr 2008 17:23:59 +0000 |
| parents | 03e503db705a |
| children | 327b7955381f |
| files | configure libaf/Makefile |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Apr 09 17:14:43 2008 +0000 +++ b/configure Wed Apr 09 17:23:59 2008 +0000 @@ -6202,11 +6202,8 @@ fi if test "$_ladspa" = yes; then _def_ladspa="#define HAVE_LADSPA" - _afsrc="$_afsrc af_ladspa.c" - _afmodules="ladspa $_afmodules" else _def_ladspa="#undef HAVE_LADSPA" - _noafmodules="ladspa $_noafmodules" fi echores "$_ladspa" @@ -7756,6 +7753,8 @@ ALSA9 = $_alsa9 ALSA1X = $_alsa1x +LADSPA = $_ladspa + # input/demuxer/codecs JOYSTICK = $_joystick LIRC = $_lirc @@ -7851,9 +7850,6 @@ # --- libao2 stuff --- AO_SRCS = $_aosrc -# --- libaf stuff --- -AF_SRCS = $_afsrc - # FFmpeg LIBAVUTIL = $_libavutil LIBAVUTIL_A = $_libavutil_a @@ -8686,13 +8682,11 @@ Codecs: $_codecmodules Audio output: $_aomodules Video output: $_vomodules - Audio filters: $_afmodules Disabled optional drivers: Input: $_noinputmodules Codecs: $_nocodecmodules Audio output: $_noaomodules Video output: $_novomodules - Audio filters: $_noafmodules 'config.h' and 'config.mak' contain your configuration options. Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer
--- a/libaf/Makefile Wed Apr 09 17:14:43 2008 +0000 +++ b/libaf/Makefile Wed Apr 09 17:23:59 2008 +0000 @@ -28,9 +28,9 @@ format.c \ reorder_ch.c \ window.c \ - $(AF_SRCS) \ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c +SRCS_COMMON-$(LADSPA) += af_ladspa.c SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c SRCS_COMMON-$(LIBAVCODEC_A) += af_lavcac3enc.c