# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190760195 -7200
# Node ID 685ac933ef8fd0a79b7197ccfd357f4176222457
# Parent  28d360594d3a8a8c656e2c507258acec6a9eba75# Parent  52d162b0dbd4e18569602054394d062a359e9e36
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins

diff -r 28d360594d3a -r 685ac933ef8f src/adplug/Makefile
--- a/src/adplug/Makefile	Wed Sep 26 00:42:58 2007 +0200
+++ b/src/adplug/Makefile	Wed Sep 26 00:43:15 2007 +0200
@@ -57,7 +57,9 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
+LD = ${CXX}
+
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${BINIO_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r 28d360594d3a -r 685ac933ef8f src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Wed Sep 26 00:42:58 2007 +0200
+++ b/src/adplug/adplug-xmms.cc	Wed Sep 26 00:43:15 2007 +0200
@@ -17,9 +17,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <algorithm>
 #include <sstream>
@@ -34,8 +32,8 @@
 #include "audacious/i18n.h"
 extern "C"
 {
+#include "audacious/plugin.h"
 #include "audacious/configdb.h"
-#include "audacious/plugin.h"
 #include "audacious/output.h"
 #include "audacious/util.h"
 }
diff -r 28d360594d3a -r 685ac933ef8f src/sid/xmms-sid.c
--- a/src/sid/xmms-sid.c	Wed Sep 26 00:42:58 2007 +0200
+++ b/src/sid/xmms-sid.c	Wed Sep 26 00:43:15 2007 +0200
@@ -38,7 +38,6 @@
 #include "xs_glade.h"
 #include "xs_player.h"
 #include "xs_slsup.h"
-#include "audacious/playlist.h"
 
 
 /*
diff -r 28d360594d3a -r 685ac933ef8f src/sid/xs_support.h
--- a/src/sid/xs_support.h	Wed Sep 26 00:42:58 2007 +0200
+++ b/src/sid/xs_support.h	Wed Sep 26 00:43:15 2007 +0200
@@ -16,7 +16,6 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/tuple.h>
 #define HAVE_MEMSET
 #else
 #include <xmms/plugin.h>