Mercurial > audlegacy-plugins
changeset 1878:685ac933ef8f
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Wed, 26 Sep 2007 00:43:15 +0200 |
| parents | 28d360594d3a (current diff) 52d162b0dbd4 (diff) |
| children | 81cdc01db60e |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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}
--- 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" }
--- 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" /*
--- 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>