From 69756ebd93e52bf708e04879608bd76bc024c091 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 30 Jun 2020 21:45:05 +0200 Subject: [PATCH] Add HAVE_NEAREST_RESAMPLER ifdef --- Makefile.common | 10 ++++++++-- griffin/griffin.c | 2 ++ libretro-common/audio/resampler/audio_resampler.c | 2 ++ qb/config.params.sh | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 8deba666f8..fef071bb98 100644 --- a/Makefile.common +++ b/Makefile.common @@ -279,8 +279,14 @@ OBJ += \ gfx/video_filter.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/audio_resampler.o \ $(LIBRETRO_COMM_DIR)/audio/dsp_filter.o \ - $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \ - $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \ + $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o + +ifeq ($(HAVE_NEAREST_RESAMPLER), 1) + DEFINES += -DHAVE_NEAREST_RESAMPLER + OBJ += $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o +endif + +OBJ += \ $(LIBRETRO_COMM_DIR)/utils/md5.o \ playlist.o \ $(LIBRETRO_COMM_DIR)/features/features_cpu.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 3adf8b5334..b3bd8594ff 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -797,7 +797,9 @@ AUDIO RESAMPLER ============================================================ */ #include "../libretro-common/audio/resampler/audio_resampler.c" #include "../libretro-common/audio/resampler/drivers/sinc_resampler.c" +#ifdef HAVE_NEAREST_RESAMPLER #include "../libretro-common/audio/resampler/drivers/nearest_resampler.c" +#endif #ifdef HAVE_CC_RESAMPLER #include "../audio/drivers_resampler/cc_resampler.c" #endif diff --git a/libretro-common/audio/resampler/audio_resampler.c b/libretro-common/audio/resampler/audio_resampler.c index 9c84f38bd6..884d961fb7 100644 --- a/libretro-common/audio/resampler/audio_resampler.c +++ b/libretro-common/audio/resampler/audio_resampler.c @@ -47,7 +47,9 @@ static const retro_resampler_t *resampler_drivers[] = { #ifdef HAVE_CC_RESAMPLER &CC_resampler, #endif +#ifdef HAVE_NEAREST_RESAMPLER &nearest_resampler, +#endif &null_resampler, NULL, }; diff --git a/qb/config.params.sh b/qb/config.params.sh index d9692adc45..b4fc8bf758 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -25,6 +25,7 @@ HAVE_DSOUND=auto # DirectSound support HAVE_XAUDIO=auto # XAudio support HAVE_WASAPI=auto # WASAPI support HAVE_WINMM=auto # WinMM support +HAVE_NEAREST_RESAMPLER=yes # Nearest resampler HAVE_CC_RESAMPLER=yes # CC Resampler HAVE_SSL=auto # SSL/mbedtls support C89_SSL=no