diff --git a/Makefile.common b/Makefile.common index 58a515c0bd..f762715bb9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -260,35 +260,35 @@ ifeq ($(HAVE_NEON),1) endif ifeq ($(HAVE_RGUI), 1) - OBJ += frontend/menu/disp/rgui.o + OBJ += menu/disp/rgui.o DEFINES += -DHAVE_MENU -DHAVE_RGUI HAVE_MENU_COMMON = 1 ifeq ($(HAVE_GLUI), 1) - OBJ += frontend/menu/disp/glui.o + OBJ += menu/disp/glui.o DEFINES += -DHAVE_GLUI endif ifeq ($(HAVE_XMB), 1) - OBJ += frontend/menu/disp/xmb.o + OBJ += menu/disp/xmb.o DEFINES += -DHAVE_XMB endif ifeq ($(HAVE_LAKKA), 1) - OBJ += frontend/menu/backend/menu_lakka_backend.o \ - frontend/menu/disp/lakka.o + OBJ += menu/backend/menu_lakka_backend.o \ + menu/disp/lakka.o DEFINES += -DHAVE_LAKKA endif endif ifeq ($(HAVE_MENU_COMMON), 1) - OBJ += frontend/menu/backend/menu_common_backend.o \ - frontend/menu/menu_input_line_cb.o \ - frontend/menu/menu_common.o \ - frontend/menu/menu_navigation.o \ - frontend/menu/menu_action.o \ - frontend/menu/menu_shader.o \ - frontend/menu/menu_entries.o \ - frontend/menu/menu_entries_cbs.o \ - frontend/menu/menu_list.o \ - frontend/menu/menu_animation.o + OBJ += menu/backend/menu_common_backend.o \ + menu/menu_input_line_cb.o \ + menu/menu_common.o \ + menu/menu_navigation.o \ + menu/menu_action.o \ + menu/menu_shader.o \ + menu/menu_entries.o \ + menu/menu_entries_cbs.o \ + menu/menu_list.o \ + menu/menu_animation.o endif ifeq ($(HAVE_FREETYPE), 1) diff --git a/Makefile.emscripten b/Makefile.emscripten index 7e0c41314f..85753b0d7b 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -65,8 +65,8 @@ clean: rm -f *.o rm -f deps/rzlib/*.o rm -f frontend/*.o - rm -f frontend/menu/*.o - rm -f frontend/menu/disp/*.o + rm -f menu/*.o + rm -f menu/disp/*.o rm -f audio/*.o rm -f audio/xaudio-c/*.o rm -f compat/*.o diff --git a/driver.c b/driver.c index 5224a6a43b..83ee375acd 100644 --- a/driver.c +++ b/driver.c @@ -32,7 +32,7 @@ #endif #ifdef HAVE_MENU -#include "frontend/menu/menu_common.h" +#include "menu/menu_common.h" #endif #ifdef HAVE_CONFIG_H diff --git a/driver.h b/driver.h index 4a6cac1762..a0b8034eeb 100644 --- a/driver.h +++ b/driver.h @@ -34,9 +34,9 @@ #include "frontend/frontend_context.h" #include -#include "frontend/menu/menu_driver.h" -#include "frontend/menu/backend/menu_backend.h" -#include "frontend/menu/disp/menu_display.h" +#include "menu/menu_driver.h" +#include "menu/backend/menu_backend.h" +#include "menu/disp/menu_display.h" #include "audio/resamplers/resampler.h" #include "record/ffemu.h" diff --git a/frontend/platform/platform_emscripten.c b/frontend/platform/platform_emscripten.c index b19a6f77cb..f1559ef6fe 100644 --- a/frontend/platform/platform_emscripten.c +++ b/frontend/platform/platform_emscripten.c @@ -21,10 +21,6 @@ #include "../../content.h" #include "../frontend.h" -#ifdef HAVE_MENU -#include "../../frontend/menu/menu_common.h" -#endif - static void emscripten_mainloop(void) { int ret = main_entry_decide(0, NULL, NULL) diff --git a/gfx/gx/gx_gfx.c b/gfx/gx/gx_gfx.c index 07ff527364..aed89d501d 100644 --- a/gfx/gx/gx_gfx.c +++ b/gfx/gx/gx_gfx.c @@ -18,7 +18,7 @@ #include "../../driver.h" #include "../../general.h" #include "../fonts/bitmap.h" -#include "../../frontend/menu/menu_common.h" +#include "../../menu/menu_common.h" #include "../gfx_common.h" #ifdef HW_RVL diff --git a/griffin/griffin.c b/griffin/griffin.c index ae3da308e0..73d0862e19 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -660,44 +660,44 @@ PLAYLISTS MENU ============================================================ */ #ifdef HAVE_MENU -#include "../frontend/menu/menu_input_line_cb.c" -#include "../frontend/menu/menu_common.c" -#include "../frontend/menu/menu_action.c" -#include "../frontend/menu/menu_list.c" -#include "../frontend/menu/menu_entries.c" -#include "../frontend/menu/menu_entries_cbs.c" -#include "../frontend/menu/menu_shader.c" -#include "../frontend/menu/menu_navigation.c" -#include "../frontend/menu/menu_animation.c" +#include "../menu/menu_input_line_cb.c" +#include "../menu/menu_common.c" +#include "../menu/menu_action.c" +#include "../menu/menu_list.c" +#include "../menu/menu_entries.c" +#include "../menu/menu_entries_cbs.c" +#include "../menu/menu_shader.c" +#include "../menu/menu_navigation.c" +#include "../menu/menu_animation.c" -#include "../frontend/menu/backend/menu_common_backend.c" +#include "../menu/backend/menu_common_backend.c" #endif #ifdef HAVE_RMENU -#include "../frontend/menu/disp/rmenu.c" +#include "../menu/disp/rmenu.c" #endif #ifdef HAVE_RGUI -#include "../frontend/menu/disp/rgui.c" +#include "../menu/disp/rgui.c" #endif #ifdef HAVE_RMENU_XUI -#include "../frontend/menu/disp/rmenu_xui.cpp" +#include "../menu/disp/rmenu_xui.cpp" #endif #ifdef HAVE_OPENGL #ifdef HAVE_LAKKA -#include "../frontend/menu/backend/menu_lakka_backend.c" -#include "../frontend/menu/disp/lakka.c" +#include "../menu/backend/menu_lakka_backend.c" +#include "../menu/disp/lakka.c" #endif #ifdef HAVE_XMB -#include "../frontend/menu/disp/xmb.c" +#include "../menu/disp/xmb.c" #endif #ifdef HAVE_GLUI -#include "../frontend/menu/disp/glui.c" +#include "../menu/disp/glui.c" #endif #endif diff --git a/frontend/menu/backend/menu_backend.h b/menu/backend/menu_backend.h similarity index 100% rename from frontend/menu/backend/menu_backend.h rename to menu/backend/menu_backend.h diff --git a/frontend/menu/backend/menu_common_backend.c b/menu/backend/menu_common_backend.c similarity index 99% rename from frontend/menu/backend/menu_common_backend.c rename to menu/backend/menu_common_backend.c index e22e33fa4d..342324c04f 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/menu/backend/menu_common_backend.c @@ -27,8 +27,8 @@ #include "../menu_entries.h" #include "../menu_input_line_cb.h" -#include "../../../input/input_autodetect.h" -#include "../../../config.def.h" +#include "../../input/input_autodetect.h" +#include "../../config.def.h" #ifdef GEKKO extern unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2]; diff --git a/frontend/menu/backend/menu_lakka_backend.c b/menu/backend/menu_lakka_backend.c similarity index 98% rename from frontend/menu/backend/menu_lakka_backend.c rename to menu/backend/menu_lakka_backend.c index d539c023dc..cec6b374da 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/menu/backend/menu_lakka_backend.c @@ -25,20 +25,20 @@ #include "../menu_navigation.h" #include "menu_backend.h" -#include "../../../gfx/gfx_common.h" -#include "../../../driver.h" -#include "../../../file_ext.h" -#include "../../../input/input_common.h" -#include "../../../config.def.h" -#include "../../../input/keyboard_line.h" +#include "../../gfx/gfx_common.h" +#include "../../driver.h" +#include "../../file_ext.h" +#include "../../input/input_common.h" +#include "../../config.def.h" +#include "../../input/keyboard_line.h" -#include "../../../settings_data.h" +#include "../../settings_data.h" #include "../disp/lakka.h" #include "../menu_animation.h" #ifdef HAVE_CONFIG_H -#include "../../../config.h" +#include "../../config.h" #endif /* Move the categories left or right depending diff --git a/frontend/menu/disp/glui.c b/menu/disp/glui.c similarity index 99% rename from frontend/menu/disp/glui.c rename to menu/disp/glui.c index 8138349bda..fa38edcb45 100644 --- a/frontend/menu/disp/glui.c +++ b/menu/disp/glui.c @@ -21,10 +21,10 @@ #include #include "../menu_common.h" -#include "../../../general.h" +#include "../../general.h" #include -#include "../../../gfx/gl_common.h" -#include "../../../gfx/video_thread_wrapper.h" +#include "../../gfx/gl_common.h" +#include "../../gfx/video_thread_wrapper.h" #include #include "shared.h" diff --git a/frontend/menu/disp/lakka.c b/menu/disp/lakka.c similarity index 99% rename from frontend/menu/disp/lakka.c rename to menu/disp/lakka.c index 690e935877..12fd94caa1 100644 --- a/frontend/menu/disp/lakka.c +++ b/menu/disp/lakka.c @@ -23,14 +23,14 @@ #include #include "../menu_common.h" -#include "../../../general.h" +#include "../../general.h" #include #include -#include "../../../gfx/gl_common.h" -#include "../../../gfx/video_thread_wrapper.h" +#include "../../gfx/gl_common.h" +#include "../../gfx/video_thread_wrapper.h" #include -#include "../../../settings_data.h" +#include "../../settings_data.h" #include "lakka.h" #include "../menu_animation.h" diff --git a/frontend/menu/disp/lakka.h b/menu/disp/lakka.h similarity index 97% rename from frontend/menu/disp/lakka.h rename to menu/disp/lakka.h index c20354c2c7..3423fe243d 100644 --- a/frontend/menu/disp/lakka.h +++ b/menu/disp/lakka.h @@ -18,8 +18,8 @@ #ifndef _MENU_DISP_LAKKA_H #define _MENU_DISP_LAKKA_H -#include "../../../gfx/gl_common.h" -#include "../../../gfx/fonts/fonts.h" +#include "../../gfx/gl_common.h" +#include "../../gfx/fonts/fonts.h" #define THEME "monochrome" // flatui or monochrome themes are available diff --git a/frontend/menu/disp/menu_display.h b/menu/disp/menu_display.h similarity index 100% rename from frontend/menu/disp/menu_display.h rename to menu/disp/menu_display.h diff --git a/frontend/menu/disp/rgui.c b/menu/disp/rgui.c similarity index 99% rename from frontend/menu/disp/rgui.c rename to menu/disp/rgui.c index 6a336fdc51..90fc57d3ea 100644 --- a/frontend/menu/disp/rgui.c +++ b/menu/disp/rgui.c @@ -22,11 +22,11 @@ #include #include "../menu_common.h" -#include "../../../general.h" +#include "../../general.h" #include #include -#include "../../../gfx/fonts/bitmap.h" +#include "../../gfx/fonts/bitmap.h" #include "shared.h" diff --git a/frontend/menu/disp/rmenu.c b/menu/disp/rmenu.c similarity index 97% rename from frontend/menu/disp/rmenu.c rename to menu/disp/rmenu.c index ec9efd5ebf..3866b50488 100644 --- a/frontend/menu/disp/rmenu.c +++ b/menu/disp/rmenu.c @@ -23,15 +23,15 @@ #include "menu_display.h" #include "../menu_common.h" -#include "../../../general.h" -#include "../../../gfx/gfx_common.h" -#include "../../../config.def.h" +#include "../../general.h" +#include "../../gfx/gfx_common.h" +#include "../../config.def.h" #include -#include "../../../performance.h" +#include "../../performance.h" -#include "../../../settings_data.h" -#include "../../../screenshot.h" -#include "../../../gfx/fonts/bitmap.h" +#include "../../settings_data.h" +#include "../../screenshot.h" +#include "../../gfx/fonts/bitmap.h" #include "shared.h" diff --git a/frontend/menu/disp/rmenu_xui.cpp b/menu/disp/rmenu_xui.cpp similarity index 98% rename from frontend/menu/disp/rmenu_xui.cpp rename to menu/disp/rmenu_xui.cpp index 08346ff6f5..6546aca276 100644 --- a/frontend/menu/disp/rmenu_xui.cpp +++ b/menu/disp/rmenu_xui.cpp @@ -23,12 +23,12 @@ #include "../menu_list.h" #include "../menu_common.h" -#include "../../../gfx/gfx_common.h" -#include "../../../gfx/gfx_context.h" +#include "../../gfx/gfx_common.h" +#include "../../gfx/gfx_context.h" -#include "../../../settings_data.h" -#include "../../../message_queue.h" -#include "../../../general.h" +#include "../../settings_data.h" +#include "../../message_queue.h" +#include "../../general.h" #include "../../gfx/d3d/d3d.hpp" diff --git a/frontend/menu/disp/shared.h b/menu/disp/shared.h similarity index 99% rename from frontend/menu/disp/shared.h rename to menu/disp/shared.h index 2c22b54f76..ec4208db62 100644 --- a/frontend/menu/disp/shared.h +++ b/menu/disp/shared.h @@ -1,7 +1,7 @@ #ifndef _DISP_SHARED_H #define _DISP_SHARED_H -#include "../../../settings_data.h" +#include "../../settings_data.h" static void get_title(const char *label, const char *dir, unsigned menu_type, char *title, size_t sizeof_title) diff --git a/frontend/menu/disp/xmb.c b/menu/disp/xmb.c similarity index 99% rename from frontend/menu/disp/xmb.c rename to menu/disp/xmb.c index 69bdadd007..c27c449189 100644 --- a/frontend/menu/disp/xmb.c +++ b/menu/disp/xmb.c @@ -21,10 +21,10 @@ #include #include "../menu_common.h" -#include "../../../general.h" +#include "../../general.h" #include -#include "../../../gfx/gl_common.h" -#include "../../../gfx/video_thread_wrapper.h" +#include "../../gfx/gl_common.h" +#include "../../gfx/video_thread_wrapper.h" #include #include "shared.h" diff --git a/frontend/menu/menu_action.c b/menu/menu_action.c similarity index 100% rename from frontend/menu/menu_action.c rename to menu/menu_action.c diff --git a/frontend/menu/menu_action.h b/menu/menu_action.h similarity index 97% rename from frontend/menu/menu_action.h rename to menu/menu_action.h index 5e84c57adb..248c471105 100644 --- a/frontend/menu/menu_action.h +++ b/menu/menu_action.h @@ -17,7 +17,7 @@ #ifndef _MENU_ACTION_H #define _MENU_ACTION_H -#include "../../settings_list.h" +#include "../settings_list.h" #ifdef __cplusplus extern "C" { diff --git a/frontend/menu/menu_animation.c b/menu/menu_animation.c similarity index 100% rename from frontend/menu/menu_animation.c rename to menu/menu_animation.c diff --git a/frontend/menu/menu_animation.h b/menu/menu_animation.h similarity index 100% rename from frontend/menu/menu_animation.h rename to menu/menu_animation.h diff --git a/frontend/menu/menu_common.c b/menu/menu_common.c similarity index 99% rename from frontend/menu/menu_common.c rename to menu/menu_common.c index 2dd439b9e0..e99c16d177 100644 --- a/frontend/menu/menu_common.c +++ b/menu/menu_common.c @@ -19,8 +19,8 @@ #include "menu_entries_cbs.h" #include "menu_list.h" #include "menu_shader.h" -#include "../../dynamic.h" -#include "../frontend.h" +#include "../dynamic.h" +#include "../frontend/frontend.h" #include static void draw_frame(void) diff --git a/frontend/menu/menu_common.h b/menu/menu_common.h similarity index 100% rename from frontend/menu/menu_common.h rename to menu/menu_common.h diff --git a/frontend/menu/menu_driver.h b/menu/menu_driver.h similarity index 99% rename from frontend/menu/menu_driver.h rename to menu/menu_driver.h index 67b04098bc..a648ac9e14 100644 --- a/frontend/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -21,7 +21,7 @@ #include #include #include "menu_list.h" -#include "../../settings_list.h" +#include "../settings_list.h" #ifdef __cplusplus extern "C" { diff --git a/frontend/menu/menu_entries.c b/menu/menu_entries.c similarity index 99% rename from frontend/menu/menu_entries.c rename to menu/menu_entries.c index 259598460a..e81657acc2 100644 --- a/frontend/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -17,7 +17,7 @@ #include "menu_entries.h" #include #include -#include "../../file_ops.h" +#include "../file_ops.h" #include void menu_entries_refresh(file_list_t *list) diff --git a/frontend/menu/menu_entries.h b/menu/menu_entries.h similarity index 97% rename from frontend/menu/menu_entries.h rename to menu/menu_entries.h index 6567f0c54d..05a7fa19b1 100644 --- a/frontend/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -20,7 +20,7 @@ #include #include "menu_common.h" #include -#include "../../settings_data.h" +#include "../settings_data.h" #ifdef __cplusplus extern "C" { diff --git a/frontend/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c similarity index 99% rename from frontend/menu/menu_entries_cbs.c rename to menu/menu_entries_cbs.c index 8f76a691a7..78c5c76408 100644 --- a/frontend/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -22,8 +22,8 @@ #include "menu_entries.h" #include "menu_shader.h" -#include "../../file_ext.h" -#include "../../config.def.h" +#include "../file_ext.h" +#include "../config.def.h" #ifdef GEKKO enum diff --git a/frontend/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h similarity index 100% rename from frontend/menu/menu_entries_cbs.h rename to menu/menu_entries_cbs.h diff --git a/frontend/menu/menu_input_line_cb.c b/menu/menu_input_line_cb.c similarity index 99% rename from frontend/menu/menu_input_line_cb.c rename to menu/menu_input_line_cb.c index 6b9b93f8f4..15d3cbd662 100644 --- a/frontend/menu/menu_input_line_cb.c +++ b/menu/menu_input_line_cb.c @@ -26,10 +26,10 @@ #include #include "menu_common.h" #include "menu_action.h" -#include "../../input/keyboard_line.h" +#include "../input/keyboard_line.h" #include "menu_input_line_cb.h" -#include "../../performance.h" -#include "../../settings_data.h" +#include "../performance.h" +#include "../settings_data.h" void menu_key_start_line(void *data, const char *label, const char *label_setting, input_keyboard_line_complete_t cb) diff --git a/frontend/menu/menu_input_line_cb.h b/menu/menu_input_line_cb.h similarity index 97% rename from frontend/menu/menu_input_line_cb.h rename to menu/menu_input_line_cb.h index 2f3fdfccfe..4a375889c4 100644 --- a/frontend/menu/menu_input_line_cb.h +++ b/menu/menu_input_line_cb.h @@ -17,7 +17,7 @@ #ifndef _MENU_INPUT_LINE_CB_H #define _MENU_INPUT_LINE_CB_H -#include "../../input/keyboard_line.h" +#include "../input/keyboard_line.h" #ifdef __cplusplus extern "C" { diff --git a/frontend/menu/menu_list.c b/menu/menu_list.c similarity index 99% rename from frontend/menu/menu_list.c rename to menu/menu_list.c index 18dc6f37bd..3f6afca1bd 100644 --- a/frontend/menu/menu_list.c +++ b/menu/menu_list.c @@ -13,7 +13,7 @@ * If not, see . */ -#include "../../driver.h" +#include "../driver.h" #include "menu_list.h" #include "menu_navigation.h" #include diff --git a/frontend/menu/menu_list.h b/menu/menu_list.h similarity index 100% rename from frontend/menu/menu_list.h rename to menu/menu_list.h diff --git a/frontend/menu/menu_navigation.c b/menu/menu_navigation.c similarity index 100% rename from frontend/menu/menu_navigation.c rename to menu/menu_navigation.c diff --git a/frontend/menu/menu_navigation.h b/menu/menu_navigation.h similarity index 100% rename from frontend/menu/menu_navigation.h rename to menu/menu_navigation.h diff --git a/frontend/menu/menu_shader.c b/menu/menu_shader.c similarity index 100% rename from frontend/menu/menu_shader.c rename to menu/menu_shader.c diff --git a/frontend/menu/menu_shader.h b/menu/menu_shader.h similarity index 97% rename from frontend/menu/menu_shader.h rename to menu/menu_shader.h index 2099baafde..132d4ca6eb 100644 --- a/frontend/menu/menu_shader.h +++ b/menu/menu_shader.h @@ -17,7 +17,7 @@ #ifndef _MENU_SHADER_MANAGER_H #define _MENU_SHADER_MANAGER_H -#include "../../gfx/shader/shader_context.h" +#include "../gfx/shader/shader_context.h" #ifdef __cplusplus extern "C" { diff --git a/retroarch.c b/retroarch.c index 02a44faa92..be5acd46ef 100644 --- a/retroarch.c +++ b/retroarch.c @@ -39,9 +39,9 @@ #include "intl/intl.h" #ifdef HAVE_MENU -#include "frontend/menu/menu_common.h" -#include "frontend/menu/menu_shader.h" -#include "frontend/menu/menu_input_line_cb.h" +#include "menu/menu_common.h" +#include "menu/menu_shader.h" +#include "menu/menu_input_line_cb.h" #endif #ifdef HAVE_NETPLAY diff --git a/runloop.c b/runloop.c index 5194b7a442..1d3536aec8 100644 --- a/runloop.c +++ b/runloop.c @@ -22,7 +22,7 @@ #include "intl/intl.h" #ifdef HAVE_MENU -#include "frontend/menu/menu_common.h" +#include "menu/menu_common.h" #endif #ifdef HAVE_NETPLAY diff --git a/settings_data.c b/settings_data.c index b11c23aa36..3db760d415 100644 --- a/settings_data.c +++ b/settings_data.c @@ -36,10 +36,10 @@ #endif #ifdef HAVE_MENU -#include "frontend/menu/menu_list.h" -#include "frontend/menu/menu_entries.h" -#include "frontend/menu/menu_input_line_cb.h" -#include "frontend/menu/menu_shader.h" +#include "menu/menu_list.h" +#include "menu/menu_entries.h" +#include "menu/menu_input_line_cb.h" +#include "menu/menu_shader.h" #endif static void get_input_config_prefix(char *buf, size_t sizeof_buf,