From 9892c1722a807da610e9d0143fe31f561e3e60b5 Mon Sep 17 00:00:00 2001 From: krcroft Date: Mon, 11 Nov 2019 14:23:05 -0800 Subject: [PATCH] Remove SpeexDSP from the auto-tools configuraiton --- configure.ac | 6 +----- src/libs/decoders/Makefile.am | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 2f82d9ac..0d081588 100644 --- a/configure.ac +++ b/configure.ac @@ -466,15 +466,11 @@ else AC_MSG_WARN([Can't find SDL_net, internal modem and ipx disabled]) fi -# Check for required Opus decoding libraries +# Check for the Opus file-handling library PKG_CHECK_MODULES([OPUSFILE], [opusfile], [ LIBS="$LIBS ${OPUSFILE_LIBS}" CPPFLAGS="$CPPFLAGS ${OPUSFILE_CFLAGS}" ], []) -PKG_CHECK_MODULES([SPEEXDSP], [speexdsp], - [ LIBS="$LIBS ${SPEEXDSP_LIBS}" - CPPFLAGS="$CPPFLAGS ${SPEEXDSP_CFLAGS}" ], []) - AH_TEMPLATE(C_X11_XKB,[define to 1 if you have XKBlib.h and X11 lib]) AC_CHECK_LIB(X11, main, have_x11_lib=yes, have_x11_lib=no, ) AC_CHECK_HEADER(X11/XKBlib.h, have_x11_h=yes, have_x11_h=no, ) diff --git a/src/libs/decoders/Makefile.am b/src/libs/decoders/Makefile.am index b7f876ab..76d425b3 100644 --- a/src/libs/decoders/Makefile.am +++ b/src/libs/decoders/Makefile.am @@ -1,22 +1,23 @@ noinst_LIBRARIES = libdecoders.a libdecoders_a_SOURCES = \ - SDL_sound.c \ - SDL_sound.h \ - SDL_sound_internal.h \ - audio_convert.c \ - wav.c \ + archive.h \ + dr_flac.h \ + dr_mp3.h \ dr_wav.h \ flac.c \ - dr_flac.h \ - opus.c \ - vorbis.c \ - stb_vorbis.h \ mp3.cpp \ mp3_seek_table.cpp \ mp3_seek_table.h \ - dr_mp3.h \ - archive.h \ + opus.c \ + SDL_sound.c \ + SDL_sound.h \ + SDL_sound_internal.h \ + stb.h \ + stb_vorbis.h \ + vorbis.c \ + wav.c \ + xxh3.h \ xxhash.c \ xxhash.h