From aa27cd93151c289e472d20e25e954ce53fd56024 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sun, 11 Apr 2010 21:39:03 +0200 Subject: fixed to pass make distcheck before 0.4-beta1 --- plugins/sid/Makefile.am | 109 +++++++++++++++++++++++++++++++-- plugins/sid/csid.cpp | 2 +- plugins/sid/sidplay-libs/Makefile.am | 2 +- plugins/sid/sidplay-libs/unix/config.h | 3 + 4 files changed, 109 insertions(+), 7 deletions(-) (limited to 'plugins/sid') diff --git a/plugins/sid/Makefile.am b/plugins/sid/Makefile.am index b7d35943..5034c222 100644 --- a/plugins/sid/Makefile.am +++ b/plugins/sid/Makefile.am @@ -1,12 +1,111 @@ +if HAVE_SID sidpath=@top_srcdir@/plugins/sid/sidplay-libs -SUBDIRS = sidplay-libs +EXTRA_DIST = \ + $(sidpath)/libsidutils/README $(sidpath)/libsidplay/README $(sidpath)/resid/README\ + $(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\ + $(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS pkglib_LTLIBRARIES = sid.la -sid_la_SOURCES = plugin.c csid.cpp csid.h +sid_la_SOURCES = plugin.c csid.cpp csid.h\ +sidplay-libs/libsidplay/src/mixer.cpp\ +sidplay-libs/libsidplay/src/player.cpp\ +sidplay-libs/libsidplay/src/mos656x/mos656x.cpp\ +sidplay-libs/libsidplay/src/mos6510/mos6510.cpp\ +sidplay-libs/libsidplay/src/sid6526/sid6526.cpp\ +sidplay-libs/libsidplay/src/sidtune/MUS.cpp\ +sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp\ +sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp\ +sidplay-libs/libsidplay/src/sidtune/SidTune.cpp\ +sidplay-libs/libsidplay/src/sidtune/PSID.cpp\ +sidplay-libs/libsidplay/src/sidtune/PP20.cpp\ +sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp\ +sidplay-libs/libsidplay/src/event.cpp\ +sidplay-libs/libsidplay/src/psiddrv.cpp\ +sidplay-libs/libsidplay/src/config.cpp\ +sidplay-libs/libsidplay/src/sidplay2.cpp\ +sidplay-libs/libsidplay/src/xsid/xsid.cpp\ +sidplay-libs/libsidplay/src/mos6526/mos6526.cpp\ +sidplay-libs/builders/resid-builder/src/resid.cpp\ +sidplay-libs/builders/resid-builder/src/resid-builder.cpp\ +sidplay-libs/resid/wave8580_PS_.cc\ +sidplay-libs/resid/filter.cc\ +sidplay-libs/resid/pot.cc\ +sidplay-libs/resid/wave.cc\ +sidplay-libs/resid/version.cc\ +sidplay-libs/resid/wave6581__ST.cc\ +sidplay-libs/resid/extfilt.cc\ +sidplay-libs/resid/wave8580_PST.cc\ +sidplay-libs/resid/wave6581_PST.cc\ +sidplay-libs/resid/wave6581_P_T.cc\ +sidplay-libs/resid/wave6581_PS_.cc\ +sidplay-libs/resid/envelope.cc\ +sidplay-libs/resid/voice.cc\ +sidplay-libs/resid/sid.cc\ +sidplay-libs/resid/wave8580__ST.cc\ +sidplay-libs/resid/wave8580_P_T.cc\ +sidplay-libs/libsidplay/src/reloc65.c\ +sidplay-libs/unix/config.h\ +sidplay-libs/libsidplay/win/VC/sidconfig.h\ +sidplay-libs/libsidplay/win/VC/sidint.h\ +sidplay-libs/libsidplay/win/VC/config.h\ +sidplay-libs/libsidplay/unix/sidconfig.h\ +sidplay-libs/libsidplay/unix/sidint.h\ +sidplay-libs/libsidplay/src/xsid/xsid.h\ +sidplay-libs/libsidplay/src/mos6526/mos6526.h\ +sidplay-libs/libsidplay/src/sid6526/sid6526.h\ +sidplay-libs/libsidplay/src/mos656x/mos656x.h\ +sidplay-libs/libsidplay/src/c64/c64xsid.h\ +sidplay-libs/libsidplay/src/c64/c64cia.h\ +sidplay-libs/libsidplay/src/c64/c64vic.h\ +sidplay-libs/libsidplay/src/nullsid.h\ +sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h\ +sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h\ +sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h\ +sidplay-libs/libsidplay/src/sidtune/PP20.h\ +sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h\ +sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h\ +sidplay-libs/libsidplay/src/mos6510/mos6510.h\ +sidplay-libs/libsidplay/src/mos6510/conf6510.h\ +sidplay-libs/libsidplay/src/mos6510/opcodes.h\ +sidplay-libs/libsidplay/src/player.h\ +sidplay-libs/libsidplay/include/sidplay/SmartPtr.h\ +sidplay-libs/libsidplay/include/sidplay/sidusage.h\ +sidplay-libs/libsidplay/include/sidplay/sidtypes.h\ +sidplay-libs/libsidplay/include/sidplay/sidplay2.h\ +sidplay-libs/libsidplay/include/sidplay/sidconfig.h\ +sidplay-libs/libsidplay/include/sidplay/SidTune.h\ +sidplay-libs/libsidplay/include/sidplay/sid2types.h\ +sidplay-libs/libsidplay/include/sidplay/c64env.h\ +sidplay-libs/libsidplay/include/sidplay/sidbuilder.h\ +sidplay-libs/libsidplay/include/sidplay/sidint.h\ +sidplay-libs/libsidplay/include/sidplay/component.h\ +sidplay-libs/libsidplay/include/sidplay/event.h\ +sidplay-libs/libsidplay/include/sidplay/sidendian.h\ +sidplay-libs/libsidplay/include/sidplay/Buffer.h\ +sidplay-libs/libsidplay/include/sidenv.h\ +sidplay-libs/libsidplay/include/config.h\ +sidplay-libs/builders/resid-builder/win/VC/config.h\ +sidplay-libs/builders/resid-builder/src/resid-emu.h\ +sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h\ +sidplay-libs/builders/resid-builder/include/config.h\ +sidplay-libs/resid/voice.h\ +sidplay-libs/resid/siddefs.h\ +sidplay-libs/resid/wave.h\ +sidplay-libs/resid/sid.h\ +sidplay-libs/resid/filter.h\ +sidplay-libs/resid/envelope.h\ +sidplay-libs/resid/spline.h\ +sidplay-libs/resid/pot.h\ +sidplay-libs/resid/extfilt.h\ +sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i\ +sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i\ +sidplay-libs/libsidplay/src/kernal.bin\ +sidplay-libs/libsidplay/src/psiddrv.bin\ +sidplay-libs/libsidplay/src/poweron.bin -sid_la_LIBADD = $(sidpath)/libsidplay2.a -lstdc++ +sid_la_LIBADD = -lstdc++ sid_la_LDFLAGS = -module AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC -AM_CPPFLAGS = $(CXXFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC - +AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP +endif diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp index 09c1d3ec..701ac3d4 100644 --- a/plugins/sid/csid.cpp +++ b/plugins/sid/csid.cpp @@ -28,7 +28,7 @@ //#include "md5.h" // #include "sidplay/sidendian.h" -#include "deadbeef.h" +#include "../../deadbeef.h" #include "csid.h" extern DB_decoder_t sid_plugin; diff --git a/plugins/sid/sidplay-libs/Makefile.am b/plugins/sid/sidplay-libs/Makefile.am index 7f4ea0b7..9adeb2e9 100644 --- a/plugins/sid/sidplay-libs/Makefile.am +++ b/plugins/sid/sidplay-libs/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = \ $(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\ $(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS -AM_CPPFLAGS = $(INSANE_CXXFLAGS) -DHAVE_UNIX -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -fPIC +AM_CPPFLAGS = $(INSANE_CXXFLAGS) -DHAVE_UNIX -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fPIC libsidplay2_a_SOURCES = \ libsidplay/src/mixer.cpp\ diff --git a/plugins/sid/sidplay-libs/unix/config.h b/plugins/sid/sidplay-libs/unix/config.h index ee1de9e8..e7dafb5c 100644 --- a/plugins/sid/sidplay-libs/unix/config.h +++ b/plugins/sid/sidplay-libs/unix/config.h @@ -1,6 +1,8 @@ /* unix/config.h. Generated by configure. */ /* unix/config.h.in. Generated from configure.ac by autoheader. */ +#if 0 + /* Define if the C++ compiler supports BOOL */ #define HAVE_BOOL @@ -106,3 +108,4 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ /* #undef WORDS_BIGENDIAN */ +#endif -- cgit v1.2.3