# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1190744418 -10800
# Node ID 52d162b0dbd4e18569602054394d062a359e9e36
# Parent  ee1b5dbb9dd6fba408b5cd60a23f1902fb7e468b
Fix AdPlug compilation.

diff -r ee1b5dbb9dd6 -r 52d162b0dbd4 src/adplug/Makefile
--- a/src/adplug/Makefile	Tue Sep 25 21:02:50 2007 +0300
+++ b/src/adplug/Makefile	Tue Sep 25 21:20:18 2007 +0300
@@ -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 ee1b5dbb9dd6 -r 52d162b0dbd4 src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Tue Sep 25 21:02:50 2007 +0300
+++ b/src/adplug/adplug-xmms.cc	Tue Sep 25 21:20:18 2007 +0300
@@ -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"
 }