diff --git a/Makefile.common b/Makefile.common index 8a76af68e4..45db8d1b7f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -86,7 +86,7 @@ endif OBJ += frontend/frontend.o \ frontend/frontend_driver.o \ - frontend/platform/platform_null.o \ + frontend/drivers/platform_null.o \ libretro_version_1.o \ retroarch.o \ runloop.o \ @@ -178,7 +178,7 @@ ifeq ($(HAVE_PYTHON), 1) endif ifeq ($(HAVE_EMSCRIPTEN), 1) -OBJ += frontend/platform/platform_emscripten.o \ +OBJ += frontend/drivers/platform_emscripten.o \ input/drivers/rwebinput_input.o \ audio/drivers/rwebaudio.o \ camera/drivers/rwebcam.o diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index a23216b302..2d1430afd4 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 -PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/platform/platform_ps3.c frontend/platform/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c +PPU_SRCS = frontend/frontend_salamander.c frontend/frontend_context.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c ifeq ($(HAVE_LOGGER), 1) PPU_CFLAGS += -DHAVE_LOGGER -Ilogger/netlogger diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index 252b499584..cbd5afc4a6 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 libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o psp1/kernel_functions.o +OBJS = frontend/frontend_salamander.o frontend/frontend_context.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/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 24dca9907e..cd0b97e088 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 libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj +OBJ = frontend/frontend_salamander.o frontend/frontend_context.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER diff --git a/frontend/platform/platform_android.c b/frontend/drivers/platform_android.c similarity index 100% rename from frontend/platform/platform_android.c rename to frontend/drivers/platform_android.c diff --git a/frontend/platform/platform_android.h b/frontend/drivers/platform_android.h similarity index 100% rename from frontend/platform/platform_android.h rename to frontend/drivers/platform_android.h diff --git a/frontend/platform/platform_apple.c b/frontend/drivers/platform_apple.c similarity index 100% rename from frontend/platform/platform_apple.c rename to frontend/drivers/platform_apple.c diff --git a/frontend/platform/platform_emscripten.c b/frontend/drivers/platform_emscripten.c similarity index 100% rename from frontend/platform/platform_emscripten.c rename to frontend/drivers/platform_emscripten.c diff --git a/frontend/platform/platform_gx.c b/frontend/drivers/platform_gx.c similarity index 100% rename from frontend/platform/platform_gx.c rename to frontend/drivers/platform_gx.c diff --git a/frontend/platform/platform_null.c b/frontend/drivers/platform_null.c similarity index 100% rename from frontend/platform/platform_null.c rename to frontend/drivers/platform_null.c diff --git a/frontend/platform/platform_ps3.c b/frontend/drivers/platform_ps3.c similarity index 100% rename from frontend/platform/platform_ps3.c rename to frontend/drivers/platform_ps3.c diff --git a/frontend/platform/platform_psp.c b/frontend/drivers/platform_psp.c similarity index 100% rename from frontend/platform/platform_psp.c rename to frontend/drivers/platform_psp.c diff --git a/frontend/platform/platform_qnx.c b/frontend/drivers/platform_qnx.c similarity index 100% rename from frontend/platform/platform_qnx.c rename to frontend/drivers/platform_qnx.c diff --git a/frontend/platform/platform_wii.c b/frontend/drivers/platform_wii.c similarity index 100% rename from frontend/platform/platform_wii.c rename to frontend/drivers/platform_wii.c diff --git a/frontend/platform/platform_xdk.c b/frontend/drivers/platform_xdk.c similarity index 100% rename from frontend/platform/platform_xdk.c rename to frontend/drivers/platform_xdk.c diff --git a/frontend/platform/platform_xdk.h b/frontend/drivers/platform_xdk.h similarity index 100% rename from frontend/platform/platform_xdk.h rename to frontend/drivers/platform_xdk.h diff --git a/frontend/frontend.h b/frontend/frontend.h index f4ce3b044b..e7a246945a 100644 --- a/frontend/frontend.h +++ b/frontend/frontend.h @@ -23,7 +23,7 @@ #include #if defined(ANDROID) -#include "platform/platform_android.h" +#include "drivers/platform_android.h" #define main_entry android_app_entry #define args_type() struct android_app* #define signature() void* data diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c index 639c1837b5..d3eda923df 100644 --- a/gfx/context/androidegl_ctx.c +++ b/gfx/context/androidegl_ctx.c @@ -21,7 +21,7 @@ #include -#include "../../frontend/platform/platform_android.h" +#include "../../frontend/drivers/platform_android.h" #include "../image/image.h" #include diff --git a/griffin/griffin.c b/griffin/griffin.c index 0c290e6553..99a5acd522 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -584,24 +584,24 @@ FRONTEND #include "../frontend/frontend_driver.c" #if defined(__CELLOS_LV2__) -#include "../frontend/platform/platform_ps3.c" +#include "../frontend/drivers/platform_ps3.c" #elif defined(GEKKO) -#include "../frontend/platform/platform_gx.c" +#include "../frontend/drivers/platform_gx.c" #ifdef HW_RVL -#include "../frontend/platform/platform_wii.c" +#include "../frontend/drivers/platform_wii.c" #endif #elif defined(_XBOX) -#include "../frontend/platform/platform_xdk.c" +#include "../frontend/drivers/platform_xdk.c" #elif defined(PSP) -#include "../frontend/platform/platform_psp.c" +#include "../frontend/drivers/platform_psp.c" #elif defined(__QNX__) -#include "../frontend/platform/platform_qnx.c" +#include "../frontend/drivers/platform_qnx.c" #elif defined(OSX) || defined(IOS) -#include "../frontend/platform/platform_apple.c" +#include "../frontend/drivers/platform_apple.c" #elif defined(ANDROID) -#include "../frontend/platform/platform_android.c" +#include "../frontend/drivers/platform_android.c" #endif -#include "../frontend/platform/platform_null.c" +#include "../frontend/drivers/platform_null.c" #include "../core_info.c" diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 919de556ab..fbc9c608c9 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -19,7 +19,7 @@ #include #include #include -#include "../../frontend/platform/platform_android.h" +#include "../../frontend/drivers/platform_android.h" #include "../input_autodetect.h" #include "../input_common.h" #include "../input_joypad.h"