# HG changeset patch # User Jonathan Schleifer # Date 1190736201 -7200 # Node ID 50f1c5a40a7dc1a00ac5e34fb53e9027b247084c # Parent 00738dd0dce608da0a44543ae68b6628e389d2d8 adplug -> new buildsys. Untested, please test! diff -r 00738dd0dce6 -r 50f1c5a40a7d src/adplug/Makefile --- a/src/adplug/Makefile Tue Sep 25 16:51:17 2007 +0200 +++ b/src/adplug/Makefile Tue Sep 25 18:03:21 2007 +0200 @@ -1,22 +1,63 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -SUBDIRS = core -OBJECTIVE_LIBS = libadplug$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) - -LIBADD = ./core/libadplugcore.a $(BINIO_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -lstdc++ +PLUGIN = adplug${PLUGIN_SUFFIX} +SRCS = adplug-xmms.cc \ + core/fmopl.c \ + core/debug.c \ + core/adlibemu.c \ + core/adplug.cxx \ + core/emuopl.cxx \ + core/diskopl.cxx \ + core/fprovide.cxx \ + core/player.cxx \ + core/database.cxx \ + core/hsc.cxx \ + core/sng.cxx \ + core/imf.cxx \ + core/players.cxx \ + core/protrack.cxx \ + core/a2m.cxx \ + core/adtrack.cxx \ + core/amd.cxx \ + core/bam.cxx \ + core/d00.cxx \ + core/dfm.cxx \ + core/dmo.cxx \ + core/hsp.cxx \ + core/ksm.cxx \ + core/mad.cxx \ + core/mid.cxx \ + core/mkj.cxx \ + core/cff.cxx \ + core/dtm.cxx \ + core/fmc.cxx \ + core/mtk.cxx \ + core/rad.cxx \ + core/raw.cxx \ + core/sa2.cxx \ + core/s3m.cxx \ + core/xad.cxx \ + core/flash.cxx \ + core/bmf.cxx \ + core/hybrid.cxx \ + core/hyp.cxx \ + core/psi.cxx \ + core/rat.cxx \ + core/u6m.cxx \ + core/rol.cxx \ + core/xsm.cxx \ + core/dro.cxx \ + core/lds.cxx \ + core/temuopl.cxx \ + core/msc.cxx \ + core/rix.cxx \ + core/adl.cxx \ + core/jbm.cxx -SOURCES = adplug-xmms.cc +plugindir = audacious/${INPUT_PLUGIN_DIR} -OBJECTS = ${SOURCES:.cc=.o} - -LIBDEP = ./core/libadplugcore.a +include ../../buildsys.mk +include ../../extra.mk -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \ - -I../../intl -I../.. -I./core -CXXFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BINIO_CFLAGS) \ - -I../../intl -I../.. -I./core - -include ../../mk/objective.mk +CPPFLAGS += ${PLUGIN_CPPFLAGS} ${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 00738dd0dce6 -r 50f1c5a40a7d src/adplug/core/Makefile --- a/src/adplug/core/Makefile Tue Sep 25 16:51:17 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk - -OBJECTIVE_LIBS_NOINST = libadplugcore.a - -C_SOURCES = fmopl.c debug.c adlibemu.c -CXX_SOURCES = adplug.cxx emuopl.cxx diskopl.cxx fprovide.cxx \ -player.cxx database.cxx hsc.cxx sng.cxx imf.cxx players.cxx protrack.cxx \ -a2m.cxx adtrack.cxx amd.cxx bam.cxx d00.cxx dfm.cxx dmo.cxx hsp.cxx ksm.cxx \ -mad.cxx mid.cxx mkj.cxx cff.cxx dtm.cxx fmc.cxx mtk.cxx rad.cxx raw.cxx \ -sa2.cxx s3m.cxx xad.cxx flash.cxx bmf.cxx hybrid.cxx hyp.cxx psi.cxx rat.cxx \ -u6m.cxx rol.cxx xsm.cxx dro.cxx lds.cxx temuopl.cxx msc.cxx rix.cxx adl.cxx \ -jbm.cxx - -SOURCES = $(C_SOURCES) $(CXX_SOURCES) - -noinst_HEADERS = adplug.h emuopl.h fmopl.h silentopl.h opl.h diskopl.h \ -a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mid.h mkj.h mtk.h \ -protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \ -flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h fprovide.h \ -database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h temuopl.h \ -msc.h rix.h adl.h jbm.h - -CXXFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp $(BEEP_DEFINES) -CFLAGS += $(PICFLAGS) $(BINIO_CFLAGS) -I../../../../intl -I../../../.. -Dstricmp=strcasecmp $(BEEP_DEFINES) - -OBJECTS = ${C_SOURCES:.c=.o} ${CXX_SOURCES:.cxx=.o} - -include ../../../mk/objective.mk