Remove some references to configurability of SINC.

This commit is contained in:
Themaister 2013-04-07 10:33:46 +02:00
parent fea6d5b55d
commit eaecc6d6f5
4 changed files with 3 additions and 6 deletions

View File

@ -31,6 +31,7 @@ OBJ = frontend/frontend.o \
gfx/fonts/fonts.o \ gfx/fonts/fonts.o \
gfx/fonts/bitmapfont.o \ gfx/fonts/bitmapfont.o \
audio/resampler.o \ audio/resampler.o \
audio/sinc.o \
performance.o performance.o
JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \ JOYCONFIG_OBJ = tools/retroarch-joyconfig.o \
@ -299,8 +300,6 @@ ifeq ($(HAVE_PYTHON), 1)
OBJ += gfx/py_state/py_state.o OBJ += gfx/py_state/py_state.o
endif endif
OBJ += audio/sinc.o
ifeq ($(HAVE_NEON),1) ifeq ($(HAVE_NEON),1)
OBJ += audio/sinc_neon.o OBJ += audio/sinc_neon.o
# When compiled without this, tries to attempt to compile sinc lerp, # When compiled without this, tries to attempt to compile sinc lerp,

View File

@ -34,6 +34,7 @@ OBJ = frontend/frontend.o \
gfx/fonts/bitmapfont.o \ gfx/fonts/bitmapfont.o \
gfx/image.o \ gfx/image.o \
audio/resampler.o \ audio/resampler.o \
audio/sinc.o \
performance.o performance.o
JOBJ := conf/config_file.o \ JOBJ := conf/config_file.o \
@ -221,8 +222,6 @@ ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/ffemu.o OBJ += record/ffemu.o
endif endif
OBJ += audio/sinc.o
ifneq ($(V), 1) ifneq ($(V), 1)
Q := @ Q := @
endif endif

View File

@ -221,7 +221,6 @@ struct settings
bool rate_control; bool rate_control;
float rate_control_delta; float rate_control_delta;
float volume; // dB scale float volume; // dB scale
char resampler[32]; char resampler[32];
} audio; } audio;

View File

@ -208,6 +208,6 @@ check_macro NEON __ARM_NEON__
add_define_make OS "$OS" add_define_make OS "$OS"
# Creates config.mk and config.h. # Creates config.mk and config.h.
VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 SINC BSV_MOVIE VIDEOCORE NEON" VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON"
create_config_make config.mk $VARS create_config_make config.mk $VARS
create_config_header config.h $VARS create_config_header config.h $VARS