From a05d4d6c2b643f7d13f810c9da33c3a268b4ad3c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 6 Jun 2014 23:15:46 +0200 Subject: [PATCH] Cleanup frontend/frontend_salamander.c --- Makefile.ps3.salamander | 2 +- Makefile.psp1.salamander | 2 +- Makefile.wii.salamander | 2 +- frontend/frontend_salamander.c | 17 +++-------------- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 35c6a3b94f..d62471704f 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. -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_null.c file_path.c 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 file_path.c 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 6737ad327d..184b6eacee 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_null.o file_path.o 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 file_path.o 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 ab55de62a0..85cdd07ad4 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_null.o file_path.o 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 file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c index 25c8defff2..736ac2a96e 100644 --- a/frontend/frontend_salamander.c +++ b/frontend/frontend_salamander.c @@ -19,23 +19,12 @@ #include #include +#include "../conf/config_file.h" +#include "../general.h" +#include "../file.h" #include "../file_ext.h" #include "frontend_context.h" - -#if defined(__CELLOS_LV2__) -#include "platform/platform_ps3.c" -#elif defined(GEKKO) -#include "platform/platform_gx.c" -#ifdef HW_RVL -#include "platform/platform_wii.c" -#endif -#elif defined(_XBOX) -#include "platform/platform_xdk.c" -#elif defined(PSP) -#include "platform/platform_psp.c" -#endif - struct defaults default_paths; //We need to set libretro to the first entry in the cores