diff options
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | plugins/ao/Makefile | 33 | ||||
| -rw-r--r-- | plugins/ao/Makefile.am | 27 | ||||
| -rw-r--r-- | plugins/dumb/Makefile.am (renamed from plugins/dumb/Makefile) | 53 | ||||
| -rw-r--r-- | plugins/shn/Makefile | 23 | ||||
| -rw-r--r-- | plugins/shn/Makefile.am | 10 | ||||
| -rwxr-xr-x | scripts/quickinstall.sh | 6 |
7 files changed, 97 insertions, 81 deletions
diff --git a/configure.ac b/configure.ac index e53e44d9..842406df 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,9 @@ AC_ARG_ENABLE(m3u, [AS_HELP_STRING([--enable-m3u ], [build m3u plugin AC_ARG_ENABLE(vfs-zip, [AS_HELP_STRING([--enable-vfs-zip ], [build vfs_zip plugin (default: auto)])], [enable_vfs_zip=$enableval], [enable_vfs_zip=yes]) AC_ARG_ENABLE(converter, [AS_HELP_STRING([--enable-converter ], [build converter plugin (default: auto)])], [enable_converter=$enableval], [enable_converter=yes]) AC_ARG_ENABLE(artwork-imlib2, [AS_HELP_STRING([--enable-artwork-imlib2 ], [use imlib2 in artwork plugin (default: auto)])], [enable_artwork_imlib2=$enableval], [enable_artwork_imlib2=yes]) +AC_ARG_ENABLE(dumb, [AS_HELP_STRING([--enable-dumb ], [build DUMB plugin (default: auto)])], [enable_dumb=$enableval], [enable_dumb=yes]) +AC_ARG_ENABLE(shn, [AS_HELP_STRING([--enable-shn ], [build SHN plugin (default: auto)])], [enable_shn=$enableval], [enable_shn=yes]) +AC_ARG_ENABLE(psf, [AS_HELP_STRING([--enable-psf ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes]) if test "x$enable_staticlink" != "xno" ; then AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version]) @@ -547,7 +550,19 @@ if test "x$enable_converter" != "xno" ; then fi fi -PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter" +if test "x$enable_dumb" != "xno" ; then + HAVE_DUMB=yes +fi + +if test "x$enable_shn" != "xno" ; then + HAVE_SHN=yes +fi + +if test "x$enable_psf" != "xno" ; then + HAVE_PSF=yes +fi + +PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao" AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes") @@ -592,6 +607,9 @@ AM_CONDITIONAL(HAVE_IMLIB2, test "x$HAVE_IMLIB2" = "xyes") AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") AM_CONDITIONAL(HAVE_YASM, test "x$HAVE_YASM" = "xyes") +AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes") +AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes") +AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes") AC_SUBST(PLUGINS_DIRS) @@ -652,6 +670,9 @@ PRINT_PLUGIN_INFO([dsp_src],[High quality samplerate conversion using libsampler PRINT_PLUGIN_INFO([m3u],[M3U and PLS playlist support],[test "x$HAVE_M3U" = "xyes"]) PRINT_PLUGIN_INFO([vfs_zip],[zip archive support],[test "x$HAVE_VFS_ZIP" = "xyes"]) PRINT_PLUGIN_INFO([converter],[plugin for converting files to any formats],[test "x$HAVE_CONVERTER" = "xyes"]) +PRINT_PLUGIN_INFO([psf],[PSF format plugin, using AOSDK],[test "x$HAVE_PSF" = "xyes"]) +PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"]) +PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"]) echo @@ -693,6 +714,9 @@ plugins/dsp_libsrc/Makefile plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile +plugins/dumb/Makefile +plugins/ao/Makefile +plugins/shn/Makefile intl/Makefile po/Makefile.in deadbeef.desktop diff --git a/plugins/ao/Makefile b/plugins/ao/Makefile deleted file mode 100644 index d188294d..00000000 --- a/plugins/ao/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -OUT=ddb_aopsf.so - -CC?=gcc - -ZLIB_LIBS?=-lz - -CFLAGS?=-O2 -fomit-frame-pointer -CFLAGS+=-Wall -fPIC -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I../.. -I./ -Ieng_ssf -Ieng_qsf -Ieng_dsf -CFLAGS+=$(STATIC_CFLAGS) - -LDFLAGS+=-module -shared -lm - -SOURCES=plugin.c main.c corlett.c\ -eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\ -eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \ -eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\ -eng_qsf/eng_qsf.c eng_qsf/kabuki.c eng_qsf/qsound.c eng_qsf/z80.c eng_qsf/z80dasm.c\ -eng_psf/eng_psf.c eng_psf/psx.c eng_psf/psx_hw.c eng_psf/peops/spu.c \ -eng_psf/eng_psf2.c eng_psf/peops2/spu2.c eng_psf/peops2/dma2.c eng_psf/peops2/registers2.c\ -eng_psf/eng_spu.c - -OBJECTS=$(SOURCES:.c=.o) - -all: $(SOURCES) $(OUT) - -$(OUT): $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $@ $(ZLIB_LIBS) - -.c.o: - $(CC) $(CFLAGS) $< -c -o $@ - -clean: - rm $(OBJECTS) $(OUT) diff --git a/plugins/ao/Makefile.am b/plugins/ao/Makefile.am new file mode 100644 index 00000000..62df2b2c --- /dev/null +++ b/plugins/ao/Makefile.am @@ -0,0 +1,27 @@ +if HAVE_PSF +aodir = $(libdir)/$(PACKAGE) +pkglib_LTLIBRARIES = ddb_aopsf.la +ddb_aopsf_la_SOURCES = plugin.c main.c corlett.c\ +eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\ +eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \ +eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\ +eng_qsf/eng_qsf.c eng_qsf/kabuki.c eng_qsf/qsound.c eng_qsf/z80.c eng_qsf/z80dasm.c\ +eng_psf/eng_psf.c eng_psf/psx.c eng_psf/psx_hw.c eng_psf/peops/spu.c \ +eng_psf/eng_psf2.c eng_psf/peops2/spu2.c eng_psf/peops2/dma2.c eng_psf/peops2/registers2.c\ +eng_psf/eng_spu.c\ +ao.h corlett.h cpuintrf.h eng_protos.h mem.h osd_cpu.h\ +eng_dsf/aicadsp.h eng_dsf/aica.h eng_dsf/arm7.h eng_dsf/arm7i.h eng_dsf/arm7thumb.h eng_dsf/dc_hw.h\ +eng_ssf/m68kconf.h eng_ssf/m68kcpu.h eng_ssf/m68k.h eng_ssf/m68kmame.h eng_ssf/m68kops.h eng_ssf/sat_hw.h eng_ssf/scspdsp.h eng_ssf/scsp.h \ +eng_qsf/qsound.h eng_qsf/z80dasm.h eng_qsf/z80.h\ +eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\ +eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\ +eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h + +ddb_aopsf_la_LDFLAGS = -module -fPIC + +EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c + +ddb_aopsf_la_LIBADD = $(LDADD) +AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm $(ZLIB_LIBS) +endif + diff --git a/plugins/dumb/Makefile b/plugins/dumb/Makefile.am index e993012f..38e6d830 100644 --- a/plugins/dumb/Makefile +++ b/plugins/dumb/Makefile.am @@ -1,14 +1,14 @@ -OUT=ddb_dumb.so +if HAVE_DUMB +dumbpath=@top_srcdir@/plugins/dumb/dumb-kode54 -CC?=gcc +EXTRA_DIST = $(dumbpath)/readme.txt $(dumbpath)/ChangeLog $(dumbpath)/licence.txt $(dumbpath)/release.txt $(dumbpath)/todo.txt -dumbpath=dumb-kode54 +pkglib_LTLIBRARIES = ddb_dumb.la -CFLAGS+=-Wall -fPIC -D_GNU_SOURCE -I$(dumbpath)/include -std=c99 +AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99 +ddb_dumb_la_LDFLAGS = -module -lm -LDFLAGS+=-module -shared -lm - -SOURCES=\ +ddb_dumb_la_SOURCES =\ dumb-kode54/src/it/readam.c\ dumb-kode54/src/it/readstm.c\ dumb-kode54/src/it/loads3m.c\ @@ -79,18 +79,29 @@ dumb-kode54/src/helpers/riff.c\ dumb-kode54/src/helpers/memfile.c\ dumb-kode54/src/helpers/sampbuf.c\ dumb-kode54/src/helpers/barray.c\ +dumb-kode54/studio/include/guitop.h\ +dumb-kode54/studio/include/dumbgui.h\ +dumb-kode54/studio/include/options.h\ +dumb-kode54/studio/include/subclip.h\ +dumb-kode54/studio/include/main.h\ +dumb-kode54/studio/include/guiproc.h\ +dumb-kode54/studio/include/dumbmenu.h\ +dumb-kode54/studio/include/dumbdesk.h\ +dumb-kode54/src/tools/it/modulus.h\ +dumb-kode54/include/internal/it.h\ +dumb-kode54/include/internal/dumb.h\ +dumb-kode54/include/internal/barray.h\ +dumb-kode54/include/internal/riff.h\ +dumb-kode54/include/internal/aldumb.h\ +dumb-kode54/include/dumb.h\ +dumb-kode54/include/aldumb.h\ +dumb-kode54/winamp/in_duh.h\ +dumb-kode54/winamp/in2.h\ +dumb-kode54/winamp/resource.h\ +dumb-kode54/winamp/out.h\ +dumb-kode54/winamp/gui.h\ +dumb-kode54/src/helpers/resample.inc\ +dumb-kode54/src/helpers/resamp2.inc\ +dumb-kode54/src/helpers/resamp3.inc\ cdumb.c - -OBJECTS=$(SOURCES:.c=.o) - -all: $(SOURCES) $(OUT) - -$(OUT): $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $@ - -.c.o: - $(CC) $(CFLAGS) $< -c -o $@ - -clean: - rm $(OBJECTS) $(OUT) - +endif diff --git a/plugins/shn/Makefile b/plugins/shn/Makefile deleted file mode 100644 index d76c8427..00000000 --- a/plugins/shn/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -OUT=ddb_shn.so - -CC?=gcc - -CFLAGS?=-I../.. -CFLAGS+=-Wall -fPIC -std=c99 -D_GNU_SOURCE -DHAVE_CONFIG_H -I. - -LDFLAGS+=-module -shared -lm - -SOURCES=array.c convert.c misc.c output.c seek.c shn.c shorten.c sulawalaw.c vario.c wave.c - -OBJECTS=$(SOURCES:.c=.o) - -all: $(SOURCES) $(OUT) - -$(OUT): $(OBJECTS) - $(CC) $(LDFLAGS) $(OBJECTS) -o $@ - -.c.o: - $(CC) $(CFLAGS) $< -c -o $@ - -clean: - rm $(OBJECTS) $(OUT) diff --git a/plugins/shn/Makefile.am b/plugins/shn/Makefile.am new file mode 100644 index 00000000..acc597ef --- /dev/null +++ b/plugins/shn/Makefile.am @@ -0,0 +1,10 @@ +if HAVE_SHN +shndir = $(libdir)/$(PACKAGE) +pkglib_LTLIBRARIES = ddb_shn.la +ddb_shn_la_SOURCES = array.c convert.c misc.c output.c seek.c shn.c shn.h shorten.c shorten.h sulawalaw.c vario.c wave.c bitshift.h + +ddb_shn_la_LDFLAGS = -module + +ddb_shn_la_LIBADD = $(LDADD) -lm +AM_CFLAGS = $(CFLAGS) -std=c99 +endif diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh index 05f4eabb..1681e2b2 100755 --- a/scripts/quickinstall.sh +++ b/scripts/quickinstall.sh @@ -24,7 +24,7 @@ cp ./plugins/pulse/.libs/pulse.so /usr/local/lib/deadbeef/ cp ./plugins/artwork/.libs/artwork.so /usr/local/lib/deadbeef/ cp ./plugins/supereq/.libs/supereq.so /usr/local/lib/deadbeef/ cp ./plugins/gme/.libs/gme.so /usr/local/lib/deadbeef/ -cp ./plugins/dumb/dumb.so /usr/local/lib/deadbeef/ +cp ./plugins/dumb/.libs/ddb_dumb.so /usr/local/lib/deadbeef/ cp ./plugins/notify/.libs/notify.so /usr/local/lib/deadbeef/ cp ./plugins/musepack/.libs/musepack.so /usr/local/lib/deadbeef/ cp ./plugins/wildmidi/.libs/wildmidi.so /usr/local/lib/deadbeef/ @@ -32,8 +32,8 @@ cp ./plugins/tta/.libs/tta.so /usr/local/lib/deadbeef/ cp ./plugins/dca/.libs/dca.so /usr/local/lib/deadbeef/ cp ./plugins/aac/.libs/aac.so /usr/local/lib/deadbeef/ cp ./plugins/mms/.libs/mms.so /usr/local/lib/deadbeef/ -cp ./plugins/shn/shn.so /usr/local/lib/deadbeef/ -cp ./plugins/ao/ao.so /usr/local/lib/deadbeef/ +cp ./plugins/shn/.libs/ddb_shn.so /usr/local/lib/deadbeef/ +cp ./plugins/ao/.libs/ddb_aopsf.so /usr/local/lib/deadbeef/ cp ./plugins/shellexec/.libs/shellexec.so /usr/local/lib/deadbeef/ cp ./plugins/dsp_libsrc/.libs/dsp_libsrc.so /usr/local/lib/deadbeef/ cp ./plugins/m3u/.libs/m3u.so /usr/local/lib/deadbeef/ |