Mercurial > audlegacy-plugins
changeset 1781:499656950801
modplug: Mk2
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Mon, 24 Sep 2007 11:53:53 -0500 |
| parents | 2c64b6d44a3c |
| children | f1bebcb97ed6 |
| files | src/modplug/Makefile src/modplug/archive/Makefile src/modplug/gui/Makefile src/modplug/gui/callbacks.cxx src/modplug/gui/interface.cxx src/modplug/gui/main.cxx src/modplug/gui/support.cxx src/modplug/gui/support.h |
| diffstat | 8 files changed, 30 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/src/modplug/Makefile Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/Makefile Mon Sep 24 11:53:53 2007 -0500 @@ -1,14 +1,8 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -OBJECTIVE_LIBS = libmodplug$(SHARED_SUFFIX) -SUBDIRS = archive gui +include ../../extra.mk -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) +PLUGIN = modplug$(SHARED_SUFFIX) +plugindir = audacious/$(INPUT_PLUGIN_DIR) -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I.. -I../.. -I../../intl -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I.. -I../.. -I../../intl -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a SOURCES.plugin = plugin.cxx modplugbmp.cxx SOURCES.core = tables.cxx \ sndmix.cxx \ @@ -43,11 +37,16 @@ load_psm.cxx \ modplug.cxx -SOURCES = ${SOURCES.core} ${SOURCES.plugin} - -OBJECTS = ${SOURCES:.cxx=.o} +SRCS = ${SOURCES.core} ${SOURCES.plugin} LIBDEP = gui/libgui.a archive/libarchive.a -include ../../mk/objective.mk +include ../../buildsys.mk + +CXXFLAGS += $(PLUGIN_CFLAGS) +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I.. -I../.. -I../../intl +LIBS += $(MOWGLI_LIBS) $(DBUS_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++ ./archive/libarchive.a ./gui/libgui.a + +SUBDIRS = archive gui
--- a/src/modplug/archive/Makefile Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/archive/Makefile Mon Sep 24 11:53:53 2007 -0500 @@ -1,11 +1,8 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +include ../../../extra.mk -CXXFLAGS += $(PICFLAGS) -I../../.. $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(AUDACIOUS_CFLAGS) +STATIC_LIB_NOINST = libarchive.a -OBJECTIVE_LIBS_NOINST = libarchive.a - -SOURCES = archive.cxx \ +SRCS = archive.cxx \ open.cxx \ arch_raw.cxx \ arch_gzip.cxx \ @@ -13,6 +10,7 @@ arch_rar.cxx \ arch_bz2.cxx -OBJECTS = ${SOURCES:.cxx=.o} +include ../../../buildsys.mk -include ../../../mk/objective.mk +CPPFLAGS += -I../../.. $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(AUDACIOUS_CFLAGS) +CXXFLAGS += $(PLUGIN_CFLAGS)
--- a/src/modplug/gui/Makefile Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/gui/Makefile Mon Sep 24 11:53:53 2007 -0500 @@ -1,12 +1,10 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +include ../../../extra.mk -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. +STATIC_LIB_NOINST = libgui.a +SRCS = main.cxx support.cxx interface.cxx callbacks.cxx -OBJECTIVE_LIBS_NOINST = libgui.a -SOURCES = main.cxx support.cxx interface.cxx callbacks.cxx +include ../../../buildsys.mk -OBJECTS = ${SOURCES:.cxx=.o} - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CXXFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../..
--- a/src/modplug/gui/callbacks.cxx Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/gui/callbacks.cxx Mon Sep 24 11:53:53 2007 -0500 @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <gtk/gtk.h> #include <iostream>
--- a/src/modplug/gui/interface.cxx Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/gui/interface.cxx Mon Sep 24 11:53:53 2007 -0500 @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>
--- a/src/modplug/gui/main.cxx Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/gui/main.cxx Mon Sep 24 11:53:53 2007 -0500 @@ -3,9 +3,7 @@ * Glade will not overwrite this file. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <gtk/gtk.h> #include <libintl.h>
--- a/src/modplug/gui/support.cxx Mon Sep 24 11:46:50 2007 -0500 +++ b/src/modplug/gui/support.cxx Mon Sep 24 11:53:53 2007 -0500 @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #include <sys/types.h> #include <sys/stat.h>