changeset 4442:d92e33b68cc8

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 Apr 2008 22:11:57 +0300
parents e71b43cae233 (diff) 32e7cf9574d8 (current diff)
children 996727ab0fe1
files
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/configdb.h	Fri Apr 11 19:31:17 2008 +0200
+++ b/src/audacious/configdb.h	Fri Apr 11 22:11:57 2008 +0300
@@ -2,7 +2,8 @@
 #define CONFIGDB_H
 
 #include <glib.h>
-#include <libmcs/mcs.h>
+
+typedef struct mcs_handle_ mcs_handle_t;
 
 G_BEGIN_DECLS
 
--- a/src/libid3tag/Makefile	Fri Apr 11 19:31:17 2008 +0200
+++ b/src/libid3tag/Makefile	Fri Apr 11 22:11:57 2008 +0300
@@ -27,10 +27,6 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${LIB_CPPFLAGS}		\
-			${GLIB_CFLAGS}		\
-			${GTK_CFLAGS}		\
-			${LIBMCS_CFLAGS}	\
-			${MOWGLI_CFLAGS}
+CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS}
 CFLAGS += ${LIB_CFLAGS}
 LIBS += ${IMPLIB_LIBS} ${GLIB_LIBS} ${GTK_LIBS} ${MOWGLI_LIBS} -lz