Mercurial > audlegacy-plugins
changeset 1873:ce50c659ac4b
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Tue, 25 Sep 2007 18:03:40 +0200 |
| parents | 50f1c5a40a7d (current diff) 0380796ac439 (diff) |
| children | c17feb2931e7 28d360594d3a |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console/Audacious_Driver.cxx Tue Sep 25 18:03:21 2007 +0200 +++ b/src/console/Audacious_Driver.cxx Tue Sep 25 18:03:40 2007 +0200 @@ -12,7 +12,6 @@ #include <audacious/i18n.h> #include <gtk/gtk.h> extern "C" { -#include "audacious/main.h" #include "audacious/tuple.h" #include "audacious/tuple_formatter.h" #include "audacious/util.h"
--- a/src/console/Makefile Tue Sep 25 18:03:21 2007 +0200 +++ b/src/console/Makefile Tue Sep 25 18:03:40 2007 +0200 @@ -55,7 +55,9 @@ include ../../buildsys.mk include ../../extra.mk -CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${DBUS_CFLAGS} -I../../intl -I../.. +LD = ${CXX} + +CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. CFLAGS += ${PLUGIN_CFLAGS} CXXFLAGS += ${PLUGIN_CFLAGS} -LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}$ ${DBUS_LIB} +LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- a/src/sid/Makefile Tue Sep 25 18:03:21 2007 +0200 +++ b/src/sid/Makefile Tue Sep 25 18:03:40 2007 +0200 @@ -22,9 +22,7 @@ include ../../buildsys.mk include ../../extra.mk -LD = ${CXX} - CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../../intl -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_INCLUDES} ${SIDPLAY2_INCLUDES} ${BUILDERS_INCLUDES} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} CFLAGS += ${PLUGIN_CFLAGS} CXXFLAGS += ${PLUGIN_CFLAGS} -LIBS += ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} +LIBS += ${BUILDERS_LDFLAGS} ${SIDPLAY1_LDADD} ${SIDPLAY2_LDADD} ${RESID_LDADD} ${HARDSID_LDADD} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lstdc++