changeset 140:89d3c397ddc3 trunk

[svn] Make it compile. :)
author nenolod
date Thu, 10 Nov 2005 15:15:36 -0800
parents d83d1fdb1790
children 4bc48a929b74
files Plugins/Input/wma/Makefile.am Plugins/Input/wma/iir.h Plugins/Input/wma/libffwma/Makefile.am
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/wma/Makefile.am	Thu Nov 10 14:59:08 2005 -0800
+++ b/Plugins/Input/wma/Makefile.am	Thu Nov 10 15:15:36 2005 -0800
@@ -4,8 +4,8 @@
 
 libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
 
-libwma_la_LDFLAGS = $(PLUGIN_LDFLAGS) libffwma/libffwma.la
+libwma_la_LDFLAGS = $(PLUGIN_LDFLAGS) ./libffwma/libffwma.la
 
 libwma_la_SOURCES = wma.c iir.c
 
-INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../include -I../libmp4v2 -I../libfaad
+INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I./libffwma
--- a/Plugins/Input/wma/iir.h	Thu Nov 10 14:59:08 2005 -0800
+++ b/Plugins/Input/wma/iir.h	Thu Nov 10 15:15:36 2005 -0800
@@ -30,8 +30,8 @@
 #include <string.h>
 
 /* XMMS public headers */
-#include <bmp/plugin.h>
-#include <bmp/util.h>
+#include <audacious/plugin.h>
+#include <audacious/util.h>
 
 #define EQ_MAX_BANDS 10
 /* Number of channels (Stereo) */
--- a/Plugins/Input/wma/libffwma/Makefile.am	Thu Nov 10 14:59:08 2005 -0800
+++ b/Plugins/Input/wma/libffwma/Makefile.am	Thu Nov 10 15:15:36 2005 -0800
@@ -1,6 +1,6 @@
-noinst_LIBRARIES=	libffwma.a
+noinst_LTLIBRARIES=	libffwma.la
 
-libffwma_a_SOURCES=	allcodecs.c allformats.c \
+libffwma_la_SOURCES=	allcodecs.c allformats.c \
 			asf.c avcodec.h avformat.h \
 			avi.h avio.c avio.h aviobuf.c \
 			bswap.h common.c common.h \
@@ -10,4 +10,4 @@
 			parser.c simple_idct.c \
 			simple_idct.h utils.c wmadata.h \
 			wmadec.c
-libffwma_a_CFLAGS=	 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c
+libffwma_la_CFLAGS=	 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -c