diff options
Diffstat (limited to 'src/libmad')
| -rw-r--r-- | src/libmad/Makefile.am | 18 | ||||
| -rw-r--r-- | src/libmad/xine_decoder.c | 7 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am index 4d4d4a3d7..cf34f36f5 100644 --- a/src/libmad/Makefile.am +++ b/src/libmad/Makefile.am @@ -8,7 +8,10 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mad.la -xineplug_decode_mad_la_SOURCES = \ +if EXTERNAL_LIBMAD +internal_sources = +else +internal_sources = \ bit.c \ fixed.c \ frame.c \ @@ -18,10 +21,19 @@ xineplug_decode_mad_la_SOURCES = \ stream.c \ synth.c \ timer.c \ - version.c \ - xine_decoder.c + version.c +endif + +xineplug_decode_mad_la_SOURCES = \ + xine_decoder.c \ + $(internal_sources) +if EXTERNAL_LIBMAD +xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(LIBMAD_LIBS) +xineplug_decode_mad_la_CFLAGS = $(LIBMAD_CFLAGS) +else xineplug_decode_mad_la_LIBADD = $(XINE_LIB) +endif xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = \ diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index 415a4dd74..4b1cdd11c 100644 --- a/src/libmad/xine_decoder.c +++ b/src/libmad/xine_decoder.c @@ -17,13 +17,18 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.53 2004/12/16 13:59:11 mroi Exp $ + * $Id: xine_decoder.c,v 1.54 2005/05/29 00:47:48 miguelfreitas Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ #include <stdlib.h> #include <string.h> +#include <config.h> + +#ifdef HAVE_MAD_H +#include <mad.h> +#endif #define LOG_MODULE "mad_decoder" #define LOG_VERBOSE |