From 2679c3d5c28bbb3c4be4ae2e99f77ee9fbbd3866 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 13 Jan 2015 00:19:46 +0100 Subject: [PATCH] Rename audio/utils.c to audio/audio_utils.c --- Makefile.common | 4 ++-- Makefile.openpandora | 2 +- android/phoenix/jni/Android.mk | 2 +- apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj | 8 ++++---- audio/audio_driver.c | 2 +- audio/{utils.c => audio_utils.c} | 2 +- audio/{utils.h => audio_utils.h} | 0 audio/{utils_neon.S => audio_utils_neon.S} | 0 audio/test/main.c | 2 +- audio/test/snr.c | 2 +- blackberry-qnx/bb10/.cproject | 14 +++++++------- blackberry-qnx/playbook/.cproject | 8 ++++---- griffin/griffin.c | 2 +- libretro_version_1.c | 2 +- record/drivers/ffmpeg.c | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) rename audio/{utils.c => audio_utils.c} (99%) rename audio/{utils.h => audio_utils.h} (100%) rename audio/{utils_neon.S => audio_utils_neon.S} (100%) diff --git a/Makefile.common b/Makefile.common index 8b31d3fe0c..e1e3cab79b 100644 --- a/Makefile.common +++ b/Makefile.common @@ -268,9 +268,9 @@ ifeq ($(HAVE_NEON),1) DEFINES += -DSINC_LOWER_QUALITY endif -OBJ += audio/utils.o +OBJ += audio/audio_utils.o ifeq ($(HAVE_NEON),1) - OBJ += audio/utils_neon.o + OBJ += audio/audio_utils_neon.o endif ifeq ($(HAVE_RGUI), 1) diff --git a/Makefile.openpandora b/Makefile.openpandora index f837719d3f..04f82f0a97 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/utils_neon.o +OBJ = griffin/griffin.o audio/resamplers/sinc_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/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index 17a9fdb258..cb419b46df 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -28,7 +28,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(HAVE_NEON),1) LOCAL_CFLAGS += -D__ARM_NEON__ - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/utils_neon.S.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/cc_resampler_neon.S.neon endif diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index 59a40adb8f..fbab903463 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -10,7 +10,7 @@ 501232C8192E5FB00063A359 /* apple_gamecontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232C7192E5FB00063A359 /* apple_gamecontroller.m */; }; 501232CA192E5FC40063A359 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 501232C9192E5FC40063A359 /* griffin.c */; }; 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CB192E5FDC0063A359 /* sinc_neon.S */; }; - 501232CE192E5FE30063A359 /* utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* utils_neon.S */; }; + 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */ = {isa = PBXBuildFile; fileRef = 501232CD192E5FE30063A359 /* audio_utils_neon.S */; }; 501232D6192E60580063A359 /* platform.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D5192E60580063A359 /* platform.m */; }; 501232D8192E605F0063A359 /* browser.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D7192E605F0063A359 /* browser.m */; }; 501232DA192E606D0063A359 /* menu.m in Sources */ = {isa = PBXBuildFile; fileRef = 501232D9192E606D0063A359 /* menu.m */; }; @@ -43,7 +43,7 @@ 501232C7192E5FB00063A359 /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = apple_gamecontroller.m; path = ../common/apple_gamecontroller.m; sourceTree = ""; }; 501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = ""; }; 501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/drivers_resampler/sinc_neon.S; sourceTree = ""; }; - 501232CD192E5FE30063A359 /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = utils_neon.S; path = ../../audio/utils_neon.S; sourceTree = ""; }; + 501232CD192E5FE30063A359 /* audio_utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = audio_utils_neon.S; path = ../../audio/audio_utils_neon.S; sourceTree = ""; }; 501232D5192E60580063A359 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = platform.m; sourceTree = ""; }; 501232D7192E605F0063A359 /* browser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = browser.m; sourceTree = ""; }; 501232D9192E606D0063A359 /* menu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = menu.m; sourceTree = ""; }; @@ -201,7 +201,7 @@ 96AFAEE516C1DC73009DE44C /* audio */ = { isa = PBXGroup; children = ( - 501232CD192E5FE30063A359 /* utils_neon.S */, + 501232CD192E5FE30063A359 /* audio_utils_neon.S */, 501232CB192E5FDC0063A359 /* sinc_neon.S */, ); name = audio; @@ -312,7 +312,7 @@ 501232DA192E606D0063A359 /* menu.m in Sources */, 501232D8192E605F0063A359 /* browser.m in Sources */, 501232D6192E60580063A359 /* platform.m in Sources */, - 501232CE192E5FE30063A359 /* utils_neon.S in Sources */, + 501232CE192E5FE30063A359 /* audio_utils_neon.S in Sources */, 501232C8192E5FB00063A359 /* apple_gamecontroller.m in Sources */, 5073C58A196C0BA40026E146 /* RAGameView.m in Sources */, 501232CC192E5FDC0063A359 /* sinc_neon.S in Sources */, diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 55569ea56b..c98aac1956 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -17,7 +17,7 @@ #include #include #include "audio_driver.h" -#include "utils.h" +#include "audio_utils.h" #include "audio_thread_wrapper.h" #include "../driver.h" #include "../general.h" diff --git a/audio/utils.c b/audio/audio_utils.c similarity index 99% rename from audio/utils.c rename to audio/audio_utils.c index 916540fd5d..d492f43c1c 100644 --- a/audio/utils.c +++ b/audio/audio_utils.c @@ -15,7 +15,7 @@ */ #include -#include "utils.h" +#include "audio_utils.h" #include "../performance.h" diff --git a/audio/utils.h b/audio/audio_utils.h similarity index 100% rename from audio/utils.h rename to audio/audio_utils.h diff --git a/audio/utils_neon.S b/audio/audio_utils_neon.S similarity index 100% rename from audio/utils_neon.S rename to audio/audio_utils_neon.S diff --git a/audio/test/main.c b/audio/test/main.c index fe04bebe15..15e5bfc4e3 100644 --- a/audio/test/main.c +++ b/audio/test/main.c @@ -17,7 +17,7 @@ // Used for testing and performance benchmarking. #include "../resamplers/resampler.h" -#include "../utils.h" +#include "../audio_utils.h" #include #include #include diff --git a/audio/test/snr.c b/audio/test/snr.c index 565c417010..01d91b16c3 100644 --- a/audio/test/snr.c +++ b/audio/test/snr.c @@ -14,7 +14,7 @@ */ #include "../resamplers/resampler.h" -#include "../utils.h" +#include "../audio_utils.h" #include #include #include diff --git a/blackberry-qnx/bb10/.cproject b/blackberry-qnx/bb10/.cproject index 3360d1ae04..856fd0f472 100644 --- a/blackberry-qnx/bb10/.cproject +++ b/blackberry-qnx/bb10/.cproject @@ -104,7 +104,7 @@ - + - + - + - + - + - + - + - + - + - + - +