mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_CC_RESAMPLER to more Makefiles

Browse Source
This commit is contained in:
twinaphex 2016-12-12 12:48:04 +01:00
parent 9375efe24e
commit 7af2e2e6b8
7 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,4 +1,5 @@
HAVE_FILE_LOGGER=1 HAVE_FILE_LOGGER=1
HAVE_CC_RESAMPLER=1
NEED_CXX_LINKER=0 NEED_CXX_LINKER=0
MISSING_DECLS =0 MISSING_DECLS =0
@ -18,7 +19,7 @@ endif
OBJ := OBJ :=
LIBS := 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)"' DEFINES += -DGLOBAL_CONFIG_DIR='"$(GLOBAL_CONFIG_DIR)"'
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)

6
Makefile.common
View File

@ -215,7 +215,6 @@ OBJ += frontend/frontend.o \
audio/drivers_resampler/sinc_resampler.o \ audio/drivers_resampler/sinc_resampler.o \
audio/drivers_resampler/nearest_resampler.o \ audio/drivers_resampler/nearest_resampler.o \
audio/drivers_resampler/null_resampler.o \ audio/drivers_resampler/null_resampler.o \
audio/drivers_resampler/cc_resampler.o \
location/drivers/nulllocation.o \ location/drivers/nulllocation.o \
camera/drivers/nullcamera.o \ camera/drivers/nullcamera.o \
wifi/drivers/nullwifi.o \ wifi/drivers/nullwifi.o \
@ -232,6 +231,11 @@ OBJ += frontend/frontend.o \
performance_counters.o \ performance_counters.o \
verbosity.o verbosity.o
ifeq ($(HAVE_CC_RESAMPLER), 1)
DEFINES += -DHAVE_CC_RESAMPLER
OBJ += audio/drivers_resampler/cc_resampler.o
endif
ifeq ($(HAVE_LANGEXTRA), 1) ifeq ($(HAVE_LANGEXTRA), 1)
DEFINES += -DHAVE_LANGEXTRA DEFINES += -DHAVE_LANGEXTRA
DEFINES += -finput-charset=UTF-8 DEFINES += -finput-charset=UTF-8

3
Makefile.ctr
View File

@ -44,9 +44,10 @@ endif
DEFINES := DEFINES :=
ifeq ($(GRIFFIN_BUILD), 1) ifeq ($(GRIFFIN_BUILD), 1)
OBJ += griffin/griffin.o 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 DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB
else else
HAVE_CC_RESAMPLER = 1
HAVE_MENU_COMMON = 1 HAVE_MENU_COMMON = 1
HAVE_RTGA = 1 HAVE_RTGA = 1
HAVE_RPNG = 1 HAVE_RPNG = 1

1
Makefile.emscripten
View File

@ -9,6 +9,7 @@ OBJ :=
DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN -s USE_PTHREADS=$(PTHREAD) 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 DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
HAVE_CC_RESAMPLER = 1
HAVE_EGL = 1 HAVE_EGL = 1
HAVE_OPENGLES = 1 HAVE_OPENGLES = 1
HAVE_RJPEG = 0 HAVE_RJPEG = 0

1
Makefile.griffin
View File

@ -1,6 +1,7 @@
DEBUG = 0 DEBUG = 0
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0 HAVE_FILE_LOGGER = 0
HAVE_CC_RESAMPLER = 1
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
BIG_STACK = 1 BIG_STACK = 1
PC_DEVELOPMENT_IP_ADDRESS = 255.255.255.255 PC_DEVELOPMENT_IP_ADDRESS = 255.255.255.255

1
Makefile.win
View File

@ -32,6 +32,7 @@ HAVE_CG := 1
HAVE_LIBXML2 := 0 HAVE_LIBXML2 := 0
HAVE_ZLIB := 1 HAVE_ZLIB := 1
WANT_ZLIB := 1 WANT_ZLIB := 1
HAVE_CC_RESAMPLER := 1
ifeq ($(HAVE_CG), 1) ifeq ($(HAVE_CG), 1)
CG_LIBS := -lcg -lcgGL CG_LIBS := -lcg -lcgGL

2
griffin/griffin.c
View File

@ -560,7 +560,9 @@ AUDIO RESAMPLER
#include "../audio/drivers_resampler/sinc_resampler.c" #include "../audio/drivers_resampler/sinc_resampler.c"
#include "../audio/drivers_resampler/nearest_resampler.c" #include "../audio/drivers_resampler/nearest_resampler.c"
#include "../audio/drivers_resampler/null_resampler.c" #include "../audio/drivers_resampler/null_resampler.c"
#ifdef HAVE_CC_RESAMPLER
#include "../audio/drivers_resampler/cc_resampler.c" #include "../audio/drivers_resampler/cc_resampler.c"
#endif
/*============================================================ /*============================================================
CAMERA CAMERA