From 1000dbb32dfe12945174528e481f54641b759e0a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Oct 2014 23:00:14 +0200 Subject: [PATCH] Rename file_path to rarch_file_path.c --- Makefile.common | 4 ++-- Makefile.ps3.salamander | 2 +- Makefile.psp1.salamander | 2 +- Makefile.wii.salamander | 2 +- griffin/griffin.c | 2 +- file_path.c => rarch_file_path.c | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename file_path.c => rarch_file_path.c (100%) diff --git a/Makefile.common b/Makefile.common index a8ae49b1ab..973535e57c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -95,7 +95,7 @@ OBJ += frontend/frontend.o \ libretro-sdk/file/file_list.o \ dir_list.o \ libretro-sdk/string/string_list.o \ - file_path.o \ + rarch_file_path.o \ hash.o \ driver.o \ general.o \ @@ -631,7 +631,7 @@ endif JOYCONFIG_OBJ += tools/retroarch-joyconfig.o \ conf/config_file.o \ - file_path.o \ + rarch_file_path.o \ libretro-sdk/string/string_list.o \ libretro-sdk/compat/compat.o \ tools/input_common_joyconfig.o diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index f28c134f68..f1a244c9e1 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -19,7 +19,7 @@ endif STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe PPU_CFLAGS += -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC -DRARCH_INTERNAL -PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c file_path.c dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c +PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c rarch_file_path.c dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c conf/config_file.c ifeq ($(HAVE_LOGGER), 1) PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index c6d6a7c389..18c4652c7b 100644 --- a/Makefile.psp1.salamander +++ b/Makefile.psp1.salamander @@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch PSP_EBOOT_ICON = psp1/ICON0.PNG PSP_EBOOT_PIC1 = psp1/PIC1.PNG -OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o +OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_psp.o frontend/platform/platform_null.o rarch_file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o psp1/kernel_functions.o PSPSDK=$(shell psp-config --pspsdk-path) include $(PSPSDK)/lib/build.mak diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 95867eee20..6c48cf2a48 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte APP_BOOTER_DIR = wii/app_booter -OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj +OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/platform/platform_gx.o frontend/platform/platform_wii.o frontend/platform/platform_null.o rarch_file_path.o libretro-sdk/string/string_list.o dir_list.o libretro-sdk/compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/griffin/griffin.c b/griffin/griffin.c index 7f95c1963f..f1e21875d6 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -522,7 +522,7 @@ FILE #include "../file.c" #include "../dir_list.c" #include "../libretro-sdk/string/string_list.c" -#include "../file_path.c" +#include "../rarch_file_path.c" #include "../libretro-sdk/file/file_list.c" /*============================================================ diff --git a/file_path.c b/rarch_file_path.c similarity index 100% rename from file_path.c rename to rarch_file_path.c