From 2f2c53586c1c094edfa205efb06ec519abac579f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 19 Jul 2019 19:03:48 +0200
Subject: [PATCH] (qb) Add HAVE_CC_RESAMPLER

---
 Makefile            | 1 -
 Makefile.common     | 5 ++++-
 qb/config.params.sh | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 57ac5534c0..0438eba7c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 HAVE_FILE_LOGGER=1
-HAVE_CC_RESAMPLER=1
 NEED_CXX_LINKER=0
 MISSING_DECLS   =0
 
diff --git a/Makefile.common b/Makefile.common
index 9c89c83fae..a6347c4324 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -285,6 +285,10 @@ endif
 ifeq ($(HAVE_CC_RESAMPLER), 1)
    DEFINES += -DHAVE_CC_RESAMPLER
    OBJ += audio/drivers_resampler/cc_resampler.o
+
+ifeq ($(HAVE_NEON),1)
+   OBJ += audio/drivers_resampler/cc_resampler_neon.o
+endif
 endif
 
 ifeq ($(HAVE_LANGEXTRA), 1)
@@ -662,7 +666,6 @@ endif
 
 ifeq ($(HAVE_NEON),1)
    OBJ += $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_neon.o \
-          audio/drivers_resampler/cc_resampler_neon.o \
           memory/neon/memcpy-neon.o
 
    DEFINES   += -DHAVE_NEON
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 197c410111..d5429186e8 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -20,6 +20,7 @@ HAVE_RUNAHEAD=yes          # Runahead support
 HAVE_DSOUND=auto           # DirectSound support
 HAVE_WASAPI=auto           # WASAPI support
 HAVE_WINMM=auto            # WinMM support
+HAVE_CC_RESAMPLER=yes      # CC Resampler
 HAVE_SSL=auto              # SSL/mbedtls support
 C89_SSL=no
 HAVE_BUILTINMBEDTLS=auto   # Bake in the mbedtls library