mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 02:00:41 +00:00
Move menu code up one root dir
This commit is contained in:
twinaphex
parent
4b8473f733
commit
4f40c14d69
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
2
driver.c
2
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
|
||||
|
||||
6
driver.h
6
driver.h
@ -34,9 +34,9 @@
|
||||
#include "frontend/frontend_context.h"
|
||||
#include <retro_miscellaneous.h>
|
||||
|
||||
#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"
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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];
|
||||
@ -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
|
||||
@ -21,10 +21,10 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include "../menu_common.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../general.h"
|
||||
#include <file/file_path.h>
|
||||
#include "../../../gfx/gl_common.h"
|
||||
#include "../../../gfx/video_thread_wrapper.h"
|
||||
#include "../../gfx/gl_common.h"
|
||||
#include "../../gfx/video_thread_wrapper.h"
|
||||
#include <compat/posix_string.h>
|
||||
|
||||
#include "shared.h"
|
||||
@ -23,14 +23,14 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include "../menu_common.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../general.h"
|
||||
#include <file/file_path.h>
|
||||
#include <file/dir_list.h>
|
||||
#include "../../../gfx/gl_common.h"
|
||||
#include "../../../gfx/video_thread_wrapper.h"
|
||||
#include "../../gfx/gl_common.h"
|
||||
#include "../../gfx/video_thread_wrapper.h"
|
||||
#include <compat/posix_string.h>
|
||||
|
||||
#include "../../../settings_data.h"
|
||||
#include "../../settings_data.h"
|
||||
|
||||
#include "lakka.h"
|
||||
#include "../menu_animation.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
|
||||
|
||||
@ -22,11 +22,11 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include "../menu_common.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../general.h"
|
||||
#include <compat/posix_string.h>
|
||||
#include <file/file_path.h>
|
||||
|
||||
#include "../../../gfx/fonts/bitmap.h"
|
||||
#include "../../gfx/fonts/bitmap.h"
|
||||
|
||||
#include "shared.h"
|
||||
|
||||
@ -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 <compat/posix_string.h>
|
||||
#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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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)
|
||||
@ -21,10 +21,10 @@
|
||||
#include <limits.h>
|
||||
|
||||
#include "../menu_common.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../general.h"
|
||||
#include <file/file_path.h>
|
||||
#include "../../../gfx/gl_common.h"
|
||||
#include "../../../gfx/video_thread_wrapper.h"
|
||||
#include "../../gfx/gl_common.h"
|
||||
#include "../../gfx/video_thread_wrapper.h"
|
||||
#include <compat/posix_string.h>
|
||||
|
||||
#include "shared.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" {
|
||||
@ -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 <file/file_path.h>
|
||||
|
||||
static void draw_frame(void)
|
||||
@ -21,7 +21,7 @@
|
||||
#include <stdint.h>
|
||||
#include <boolean.h>
|
||||
#include "menu_list.h"
|
||||
#include "../../settings_list.h"
|
||||
#include "../settings_list.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -17,7 +17,7 @@
|
||||
#include "menu_entries.h"
|
||||
#include <file/file_list.h>
|
||||
#include <file/file_path.h>
|
||||
#include "../../file_ops.h"
|
||||
#include "../file_ops.h"
|
||||
#include <file/dir_list.h>
|
||||
|
||||
void menu_entries_refresh(file_list_t *list)
|
||||
@ -20,7 +20,7 @@
|
||||
#include <stdlib.h>
|
||||
#include "menu_common.h"
|
||||
#include <file/file_list.h>
|
||||
#include "../../settings_data.h"
|
||||
#include "../settings_data.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "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
|
||||
@ -26,10 +26,10 @@
|
||||
#include <ctype.h>
|
||||
#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)
|
||||
@ -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" {
|
||||
@ -13,7 +13,7 @@
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "../../driver.h"
|
||||
#include "../driver.h"
|
||||
#include "menu_list.h"
|
||||
#include "menu_navigation.h"
|
||||
#include <string.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" {
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user