From 7f1c4fa2ff7498961703664bcd2e53372e7949df Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 14 Mar 2016 15:49:02 +0100 Subject: [PATCH] Rename sinc_neon.S to sinc_resampler_neon.S --- Makefile.common | 2 +- Makefile.griffin | 2 +- Makefile.openpandora | 2 +- .../{sinc_neon.S => sinc_resampler_neon.S} | 0 pkg/android/phoenix/jni/Android.mk | 2 +- pkg/android/phoenix/jni/Android2.mk | 2 +- pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj | 14 +++++++------- 7 files changed, 12 insertions(+), 12 deletions(-) rename audio/drivers_resampler/{sinc_neon.S => sinc_resampler_neon.S} (100%) diff --git a/Makefile.common b/Makefile.common index e8ef8ba2e4..42ef3309eb 100644 --- a/Makefile.common +++ b/Makefile.common @@ -351,7 +351,7 @@ endif # Audio Resamplers ifeq ($(HAVE_NEON),1) - OBJ += audio/drivers_resampler/sinc_neon.o \ + OBJ += audio/drivers_resampler/sinc_resampler_neon.o \ audio/drivers_resampler/cc_resampler_neon.o # When compiled without this, tries to attempt to compile sinc lerp, # which will error out diff --git a/Makefile.griffin b/Makefile.griffin index ae0ae6d53e..d6c4fac490 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -205,7 +205,7 @@ else ifeq ($(platform), vita) -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub -lUVLoader_stub \ -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng - PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \ + PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_resampler_neon.o \ audio/drivers_resampler/cc_resampler_neon.o LIBDIRS += -L. diff --git a/Makefile.openpandora b/Makefile.openpandora index 88eeb6c90f..77aaf1ce74 100644 --- a/Makefile.openpandora +++ b/Makefile.openpandora @@ -10,7 +10,7 @@ TARGET := retroarch-pandora LDDIRS = -L. -L$(PNDSDK)/usr/lib INCDIRS = -I. -I$(PNDSDK)/usr/include -OBJ = griffin/griffin.o audio/resamplers/sinc_neon.o audio/audio_utils_neon.o +OBJ = griffin/griffin.o audio/resamplers/sinc_resampler_neon.o audio/audio_utils_neon.o LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound diff --git a/audio/drivers_resampler/sinc_neon.S b/audio/drivers_resampler/sinc_resampler_neon.S similarity index 100% rename from audio/drivers_resampler/sinc_neon.S rename to audio/drivers_resampler/sinc_resampler_neon.S diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 0b8a829bd9..7861622a6b 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -25,7 +25,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(HAVE_NEON),1) DEFINES += -D__ARM_NEON__ LOCAL_SRC_FILES += $(RARCH_DIR)/audio/audio_utils_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_resampler_neon.S.neon LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon endif DEFINES += -DSINC_LOWER_QUALITY diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index c890d89af8..18f7691ff2 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -25,7 +25,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(HAVE_NEON),1) DEFINES += -D__ARM_NEON__ LOCAL_SRC_FILES += $(RARCH_DIR)/audio/audio_utils_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_resampler_neon.S.neon LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon endif DEFINES += -DSINC_LOWER_QUALITY diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 88c7d8ab6d..21abba3ac1 100644 --- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 0FDA2A721BE1AFA800F2B5DA /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 0FDA2A731BE1AFA800F2B5DA /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; 0FDA2A741BE1AFA800F2B5DA /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; - 0FDA2A751BE1AFA800F2B5DA /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; + 0FDA2A751BE1AFA800F2B5DA /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 0FDA2A761BE1AFA800F2B5DA /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 0FDA2A781BE1AFA800F2B5DA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5040F04F1AE47ED4006F6972 /* libz.dylib */; }; 0FDA2A791BE1AFA800F2B5DA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; @@ -34,14 +34,14 @@ 0FDA2A8C1BE1AFA800F2B5DA /* iOS/modules in Resources */ = {isa = PBXBuildFile; fileRef = 83EB675F19EEAF050096F441 /* iOS/modules */; }; 0FDA2A8D1BE1AFA800F2B5DA /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 84F9A9BB1A87E068003AF12F /* assets */; }; 501232CA192E5FC40063A359 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; - 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; + 501232CC192E5FDC0063A359 /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; 501881EC184BAD6D006F665D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881EB184BAD6D006F665D /* AVFoundation.framework */; }; 501881EE184BB54C006F665D /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501881ED184BB54C006F665D /* CoreMedia.framework */; }; 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */; }; 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; }; 5037008A1ACA18E400A51A37 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; - 5037008B1ACA18E400A51A37 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; + 5037008B1ACA18E400A51A37 /* sinc_resampler_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */; }; 5037008C1ACA18E400A51A37 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 5037008E1ACA18E400A51A37 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50C3B1AD1AB1107100F478D3 /* QuartzCore.framework */; }; 503700901ACA18E400A51A37 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 696012F119F3389A006A1088 /* CoreText.framework */; }; @@ -90,7 +90,7 @@ 0FDA2A911BE1AFA800F2B5DA /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; }; 0FDA2A921BE1AFA800F2B5DA /* RetroArch_iOS9-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "RetroArch_iOS9-Info.plist"; path = "/Users/buildbot/buildbot/ios/retroarch/pkg/apple/RetroArch_iOS9-Info.plist"; sourceTree = ""; }; 501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; }; - 501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/drivers_resampler/sinc_neon.S; sourceTree = SOURCE_ROOT; }; + 501232CB192E5FDC0063A359 /* sinc_resampler_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_resampler_neon.S; path = ../../audio/drivers_resampler/sinc_resampler_neon.S; sourceTree = SOURCE_ROOT; }; 501232CD192E5FE30063A359 /* audio_utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = audio_utils_neon.S; path = ../../audio/audio_utils_neon.S; sourceTree = SOURCE_ROOT; }; 501881EB184BAD6D006F665D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 501881ED184BB54C006F665D /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; @@ -449,7 +449,7 @@ 0FDA2A721BE1AFA800F2B5DA /* cc_resampler_neon.S in Sources */, 0FDA2A731BE1AFA800F2B5DA /* griffin_objc.m in Sources */, 0FDA2A741BE1AFA800F2B5DA /* audio_utils_neon.S in Sources */, - 0FDA2A751BE1AFA800F2B5DA /* sinc_neon.S in Sources */, + 0FDA2A751BE1AFA800F2B5DA /* sinc_resampler_neon.S in Sources */, 0FDA2A761BE1AFA800F2B5DA /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -461,7 +461,7 @@ 503700881ACA18E400A51A37 /* cc_resampler_neon.S in Sources */, 503700891ACA18E400A51A37 /* griffin_objc.m in Sources */, 5037008A1ACA18E400A51A37 /* audio_utils_neon.S in Sources */, - 5037008B1ACA18E400A51A37 /* sinc_neon.S in Sources */, + 5037008B1ACA18E400A51A37 /* sinc_resampler_neon.S in Sources */, 5037008C1ACA18E400A51A37 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -473,7 +473,7 @@ 50D00E8E19D117C400EBA71E /* cc_resampler_neon.S in Sources */, 50521A441AA23BF500185CC9 /* griffin_objc.m in Sources */, 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */, - 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */, + 501232CC192E5FDC0063A359 /* sinc_resampler_neon.S in Sources */, 501232CA192E5FC40063A359 /* griffin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0;