From 772ed15d881c0c337a6d688066d41e28251e3646 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 22 Aug 2020 13:42:57 +0200 Subject: [PATCH] Remove file_path_str from Salamander --- Makefile.ctr.salamander | 1 - Makefile.ps2.salamander | 1 - Makefile.ps3.salamander | 1 - Makefile.psl1ght.salamander | 3 +-- Makefile.psp1.salamander | 1 - Makefile.vita.salamander | 1 - Makefile.wii.salamander | 1 - Makefile.wiiu | 1 - pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj | 2 -- .../RetroArch-360-Salamander/RetroArch-Salamander.vcxproj | 8 -------- .../RetroArch-Salamander.vcxproj.filters | 3 --- .../RetroArch-Salamander.vcproj | 3 --- samples/tasks/database/Makefile | 1 - 13 files changed, 1 insertion(+), 26 deletions(-) diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander index ffd3082f3f..2e1bfc7e86 100644 --- a/Makefile.ctr.salamander +++ b/Makefile.ctr.salamander @@ -39,7 +39,6 @@ OBJ := ctr/ctr_system.o \ libretro-common/vfs/vfs_implementation.o \ libretro-common/hash/rhash.o \ libretro-common/time/rtime.o \ - file_path_str.o \ verbosity.o OBJ += ctr/exec-3dsx/exec_cia.o \ diff --git a/Makefile.ps2.salamander b/Makefile.ps2.salamander index b25103d2ea..a076ae2abd 100644 --- a/Makefile.ps2.salamander +++ b/Makefile.ps2.salamander @@ -61,7 +61,6 @@ EE_OBJS = frontend/frontend_salamander.o \ libretro-common/vfs/vfs_implementation.o \ libretro-common/hash/rhash.o \ libretro-common/time/rtime.o \ - file_path_str.o \ verbosity.o \ ps2/compat_files/ps2_devices.o diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 09cd045b42..5309179414 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -60,7 +60,6 @@ PPU_SRCS = frontend/frontend_salamander.c \ libretro-common/vfs/vfs_implementation.c \ libretro-common/file/config_file.c \ libretro-common/time/rtime.c \ - file_path_str.c \ verbosity.c ifeq ($(HAVE_LOGGER), 1) diff --git a/Makefile.psl1ght.salamander b/Makefile.psl1ght.salamander index c7ef0a6751..79bd18ac6e 100644 --- a/Makefile.psl1ght.salamander +++ b/Makefile.psl1ght.salamander @@ -71,8 +71,7 @@ OBJ = frontend/frontend_salamander.o \ libretro-common/vfs/vfs_implementation.o \ libretro-common/file/config_file.o \ libretro-common/time/rtime.o \ - file_path_str.o \ - verbosity.o + verbosity.o ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index ef3f77c3ea..b864e94ae5 100644 --- a/Makefile.psp1.salamander +++ b/Makefile.psp1.salamander @@ -50,7 +50,6 @@ OBJS = frontend/frontend_salamander.o \ libretro-common/vfs/vfs_implementation.o \ libretro-common/hash/rhash.o \ libretro-common/time/rtime.o \ - file_path_str.o \ verbosity.o \ bootstrap/psp1/kernel_functions.o diff --git a/Makefile.vita.salamander b/Makefile.vita.salamander index 726618d6e1..612ad53a33 100644 --- a/Makefile.vita.salamander +++ b/Makefile.vita.salamander @@ -50,7 +50,6 @@ OBJS = frontend/frontend_salamander.o \ libretro-common/vfs/vfs_implementation.o \ libretro-common/hash/rhash.o \ libretro-common/time/rtime.o \ - file_path_str.o \ verbosity.o all: $(TARGET).vpk diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 933982613d..9c27c708f7 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -70,7 +70,6 @@ OBJ = frontend/frontend_salamander.o \ libretro-common/compat/fopen_utf8.o \ libretro-common/file/config_file.o \ libretro-common/time/rtime.o \ - file_path_str.o \ verbosity.o \ $(APP_BOOTER_DIR)/app_booter.binobj diff --git a/Makefile.wiiu b/Makefile.wiiu index 4691d9cf72..72f15e8e6e 100644 --- a/Makefile.wiiu +++ b/Makefile.wiiu @@ -68,7 +68,6 @@ ifeq ($(SALAMANDER_BUILD),1) OBJ += libretro-common/vfs/vfs_implementation.o OBJ += libretro-common/hash/rhash.o OBJ += libretro-common/time/rtime.o - OBJ += file_path_str.o OBJ += verbosity.o # $(SALAMANDER_BUILD),0 diff --git a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj index c8b4cf7360..09fad84af8 100644 --- a/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj @@ -286,7 +286,6 @@ 92B9ECB724E054B500E6CFB2 /* switch_performance_profiles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = switch_performance_profiles.h; path = ../../switch_performance_profiles.h; sourceTree = ""; }; 92B9ECB824E054B500E6CFB2 /* driver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = driver.h; path = ../../driver.h; sourceTree = ""; }; 92B9ECB924E054B500E6CFB2 /* version.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../version.h; sourceTree = ""; }; - 92B9ECBA24E054B500E6CFB2 /* file_path_str.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = file_path_str.c; path = ../../file_path_str.c; sourceTree = ""; }; 92B9ECBB24E054B500E6CFB2 /* disk_index_file.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = disk_index_file.h; path = ../../disk_index_file.h; sourceTree = ""; }; 92B9ECBC24E054B500E6CFB2 /* core_backup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = core_backup.c; path = ../../core_backup.c; sourceTree = ""; }; 92B9ECBD24E054B500E6CFB2 /* database_info.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = database_info.h; path = ../../database_info.h; sourceTree = ""; }; @@ -865,7 +864,6 @@ 92B9ECB224E054B400E6CFB2 /* dynamic.h */, 92B9ECC724E054B600E6CFB2 /* file_path_special.c */, 92B9ECA724E054B300E6CFB2 /* file_path_special.h */, - 92B9ECBA24E054B500E6CFB2 /* file_path_str.c */, 92B9ECAD24E054B400E6CFB2 /* lakka.h */, 92B9ECB324E054B400E6CFB2 /* list_special.h */, 92B9ECAB24E054B400E6CFB2 /* manual_content_scan.c */, diff --git a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj index 1cdee0b1ca..ad3bf209c9 100644 --- a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj +++ b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj @@ -262,14 +262,6 @@ - - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC - CompileAsC CompileAsC diff --git a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters index b9a9ee51de..ddd420c35c 100644 --- a/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters +++ b/pkg/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters @@ -89,8 +89,5 @@ Source Files\libretro-common\compat - - Source Files - diff --git a/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj index 0d42ddce69..6e5a11677a 100644 --- a/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj +++ b/pkg/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj @@ -278,9 +278,6 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> - - diff --git a/samples/tasks/database/Makefile b/samples/tasks/database/Makefile index 4fb16b2f8f..d14eff8565 100644 --- a/samples/tasks/database/Makefile +++ b/samples/tasks/database/Makefile @@ -94,7 +94,6 @@ SOURCES_C := \ $(CORE_DIR)/tasks/task_database_cue.c \ $(CORE_DIR)/database_info.c \ $(CORE_DIR)/core_info.c \ - $(CORE_DIR)/file_path_str.c \ $(CORE_DIR)/msg_hash.c \ $(CORE_DIR)/intl/msg_hash_us.c \ $(CORE_DIR)/playlist.c \