mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11906 from fjtrujy/FixLegacyLogs_PS2_PSP

Browse Source 
[PS2] [PSP] Remove not needed logger configuration
This commit is contained in:
Autechre 2021-01-19 14:46:41 +01:00 committed by GitHub
commit ded9a428de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.ps2
View File

@ -1,10 +1,8 @@
BUILD_FOR_PCSX2 = 0 BUILD_FOR_PCSX2 = 0
DEBUG = 0 DEBUG = 0
HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0
HAVE_THREADS = 0 HAVE_THREADS = 0
MUTE_WARNINGS = 1 MUTE_WARNINGS = 1
PS2_IP = 192.168.1.150 PS2_IP = 192.168.1.10
TARGET = retroarchps2-debug.elf TARGET = retroarchps2-debug.elf
TARGET_RELEASE = retroarchps2.elf TARGET_RELEASE = retroarchps2.elf
@ -47,10 +45,6 @@ ifeq ($(HAVE_THREADS), 1)
RARCH_DEFINES += -DHAVE_THREADS RARCH_DEFINES += -DHAVE_THREADS
endif endif
ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER
endif
CFLAGS += $(RARCH_DEFINES) CFLAGS += $(RARCH_DEFINES)
# All the IRX objects # All the IRX objects

5
Makefile.ps2.salamander
View File

@ -1,6 +1,5 @@
BUILD_FOR_PCSX2 = 0 BUILD_FOR_PCSX2 = 0
DEBUG = 0 DEBUG = 0
HAVE_FILE_LOGGER = 0
MUTE_WARNINGS = 1 MUTE_WARNINGS = 1
PS2_IP = 192.168.1.150 PS2_IP = 192.168.1.150
@ -37,10 +36,6 @@ ifeq ($(BUILD_FOR_PCSX2), 1)
RARCH_DEFINES += -DBUILD_FOR_PCSX2 RARCH_DEFINES += -DBUILD_FOR_PCSX2
endif endif
ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER
endif
CFLAGS += $(RARCH_DEFINES) CFLAGS += $(RARCH_DEFINES)
EE_OBJS = frontend/frontend_salamander.o \ EE_OBJS = frontend/frontend_salamander.o \

6
Makefile.psp1
View File

@ -2,8 +2,6 @@ BUILD_PRX = 0
PSP_LARGE_MEMORY = 1 PSP_LARGE_MEMORY = 1
DEBUG = 0 DEBUG = 0
HAVE_KERNEL_PRX = 1 HAVE_KERNEL_PRX = 1
HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0
HAVE_THREADS = 1 HAVE_THREADS = 1
BIG_STACK = 0 BIG_STACK = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
@ -35,10 +33,6 @@ ifeq ($(HAVE_THREADS), 1)
RARCH_DEFINES += -DHAVE_THREADS RARCH_DEFINES += -DHAVE_THREADS
endif endif
ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER
endif
ifeq ($(HAVE_KERNEL_PRX), 1) ifeq ($(HAVE_KERNEL_PRX), 1)
CFLAGS += -DHAVE_KERNEL_PRX CFLAGS += -DHAVE_KERNEL_PRX
endif endif

5
Makefile.psp1.salamander
View File

@ -1,6 +1,5 @@
BUILD_PRX = 0 BUILD_PRX = 0
PSP_LARGE_MEMORY = 1 PSP_LARGE_MEMORY = 1
HAVE_FILE_LOGGER = 0
DEBUG = 0 DEBUG = 0
TARGET = retroarchpsp_salamander TARGET = retroarchpsp_salamander
@ -21,10 +20,6 @@ LIBDIR =
LDFLAGS = LDFLAGS =
LIBS = -lstdc++ -lm -lpsppower LIBS = -lstdc++ -lm -lpsppower
ifeq ($(HAVE_FILE_LOGGER), 1)
CFLAGS += -DHAVE_FILE_LOGGER
endif
CFLAGS += $(RARCH_DEFINES) CFLAGS += $(RARCH_DEFINES)
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP

12
frontend/drivers/platform_ps2.c
View File

@ -195,14 +195,6 @@ static void frontend_ps2_init(void *data)
#endif #endif
#endif #endif
#if defined(HAVE_FILE_LOGGER)
char fileLog[FILENAME_MAX];
strlcpy(fileLog, rootDevicePath(bootDeviceID), sizeof(fileLog));
strcat(fileLog, "retroarch.log");
retro_main_log_file_init(fileLog, false);
verbosity_enable();
#endif
#if !defined(DEBUG) #if !defined(DEBUG)
waitUntilDeviceIsReady(bootDeviceID); waitUntilDeviceIsReady(bootDeviceID);
#endif #endif
@ -210,10 +202,6 @@ static void frontend_ps2_init(void *data)
static void frontend_ps2_deinit(void *data) static void frontend_ps2_deinit(void *data)
{ {
#if defined(HAVE_FILE_LOGGER)
verbosity_disable();
retro_main_log_file_deinit();
#endif
} }
static void frontend_ps2_exec(const char *path, bool should_load_game) static void frontend_ps2_exec(const char *path, bool should_load_game)

1
frontend/drivers/platform_psp.c
View File

@ -234,7 +234,6 @@ static void frontend_psp_deinit(void *data)
{ {
(void)data; (void)data;
#ifndef IS_SALAMANDER #ifndef IS_SALAMANDER
verbosity_disable();
pthread_terminate(); pthread_terminate();
#endif #endif
} }