From 7af2e2e6b8a0957b5189d79a4fa930032730fe45 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Dec 2016 12:48:04 +0100
Subject: [PATCH] Add HAVE_CC_RESAMPLER to more Makefiles

---
 Makefile            | 3 ++-
 Makefile.common     | 6 +++++-
 Makefile.ctr        | 3 ++-
 Makefile.emscripten | 1 +
 Makefile.griffin    | 1 +
 Makefile.win        | 1 +
 griffin/griffin.c   | 2 ++
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 22bc87b4c1..c31e4bdb95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 HAVE_FILE_LOGGER=1
+HAVE_CC_RESAMPLER=1
 NEED_CXX_LINKER=0
 MISSING_DECLS   =0
 
@@ -18,7 +19,7 @@ endif
 
 OBJ := 
 LIBS :=
-DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER
+DEFINES := -DHAVE_CONFIG_H -DRARCH_INTERNAL -DHAVE_OVERLAY
 DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
 
 ifneq ($(findstring Win32,$(OS)),)
diff --git a/Makefile.common b/Makefile.common
index 20b2a0e1e0..792725bb5b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -215,7 +215,6 @@ OBJ += frontend/frontend.o \
        audio/drivers_resampler/sinc_resampler.o \
        audio/drivers_resampler/nearest_resampler.o \
        audio/drivers_resampler/null_resampler.o \
-       audio/drivers_resampler/cc_resampler.o \
        location/drivers/nulllocation.o \
        camera/drivers/nullcamera.o \
        wifi/drivers/nullwifi.o \
@@ -232,6 +231,11 @@ OBJ += frontend/frontend.o \
        performance_counters.o \
        verbosity.o
 
+ifeq ($(HAVE_CC_RESAMPLER), 1)
+DEFINES += -DHAVE_CC_RESAMPLER
+OBJ += audio/drivers_resampler/cc_resampler.o
+endif
+
 ifeq ($(HAVE_LANGEXTRA), 1)
 DEFINES += -DHAVE_LANGEXTRA
 DEFINES += -finput-charset=UTF-8
diff --git a/Makefile.ctr b/Makefile.ctr
index a5f9939eb5..ba6139c5be 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -44,9 +44,10 @@ endif
 DEFINES :=
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB -DHAVE_CC_RESAMPLER
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
 else
+	HAVE_CC_RESAMPLER = 1
 	HAVE_MENU_COMMON = 1
 	HAVE_RTGA = 1
 	HAVE_RPNG = 1
diff --git a/Makefile.emscripten b/Makefile.emscripten
index d63c16aae4..1b420651c7 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -9,6 +9,7 @@ OBJ :=
 DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD)
 DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
 
+HAVE_CC_RESAMPLER = 1
 HAVE_EGL    = 1
 HAVE_OPENGLES = 1
 HAVE_RJPEG  = 0
diff --git a/Makefile.griffin b/Makefile.griffin
index e0c234d14c..24505188e2 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -1,6 +1,7 @@
 DEBUG			               = 0
 HAVE_LOGGER		            = 0
 HAVE_FILE_LOGGER	         = 0
+HAVE_CC_RESAMPLER          = 1
 WHOLE_ARCHIVE_LINK         = 0
 BIG_STACK		            = 1
 PC_DEVELOPMENT_IP_ADDRESS	= 255.255.255.255
diff --git a/Makefile.win b/Makefile.win
index df7f2502dc..a198553aa7 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -32,6 +32,7 @@ HAVE_CG       := 1
 HAVE_LIBXML2  := 0
 HAVE_ZLIB     := 1
 WANT_ZLIB     := 1
+HAVE_CC_RESAMPLER := 1
 
 ifeq ($(HAVE_CG), 1)
 CG_LIBS          := -lcg -lcgGL
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8c8b619506..eedd19565a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -560,7 +560,9 @@ AUDIO RESAMPLER
 #include "../audio/drivers_resampler/sinc_resampler.c"
 #include "../audio/drivers_resampler/nearest_resampler.c"
 #include "../audio/drivers_resampler/null_resampler.c"
+#ifdef HAVE_CC_RESAMPLER
 #include "../audio/drivers_resampler/cc_resampler.c"
+#endif
 
 /*============================================================
 CAMERA