mirror of
https://github.com/libretro/RetroArch
synced 2025-04-16 08:43:10 +00:00
Move display rasterizers for menu_common to frontend/menu/disp
This commit is contained in:
parent
a7a30646de
commit
177af1fac2
2
Makefile
2
Makefile
@ -90,7 +90,7 @@ ifneq ($(findstring Linux,$(OS)),)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_RGUI), 1)
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
|
||||
DEFINES += -DHAVE_MENU
|
||||
endif
|
||||
|
||||
|
@ -67,7 +67,7 @@ endif
|
||||
|
||||
ifeq ($(HAVE_RGUI), 1)
|
||||
DEFINES += -DHAVE_MENU -DHAVE_RGUI
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_SDL), 1)
|
||||
|
@ -102,7 +102,7 @@ JLIBS =
|
||||
|
||||
ifeq ($(HAVE_RGUI), 1)
|
||||
DEFINES += -DHAVE_RGUI -DHAVE_MENU
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
|
||||
OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_SDL), 1)
|
||||
|
@ -21,25 +21,21 @@
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "menu_common.h"
|
||||
#include "menu_context.h"
|
||||
#include "../../file_list.h"
|
||||
#include "../../general.h"
|
||||
#include "../../gfx/gfx_common.h"
|
||||
#include "../../config.def.h"
|
||||
#include "../../file.h"
|
||||
#include "../../dynamic.h"
|
||||
#include "../../compat/posix_string.h"
|
||||
#include "../../gfx/shader_parse.h"
|
||||
#include "../../performance.h"
|
||||
#include "../../input/input_common.h"
|
||||
#include "../menu_common.h"
|
||||
#include "../menu_context.h"
|
||||
#include "../../../file_list.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../../gfx/gfx_common.h"
|
||||
#include "../../../config.def.h"
|
||||
#include "../../../file.h"
|
||||
#include "../../../dynamic.h"
|
||||
#include "../../../compat/posix_string.h"
|
||||
#include "../../../gfx/shader_parse.h"
|
||||
#include "../../../performance.h"
|
||||
#include "../../../input/input_common.h"
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
#include "../../gfx/gl_common.h"
|
||||
#endif
|
||||
|
||||
#include "../../screenshot.h"
|
||||
#include "../../gfx/fonts/bitmap.h"
|
||||
#include "../../../screenshot.h"
|
||||
#include "../../../gfx/fonts/bitmap.h"
|
||||
|
||||
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
|
||||
#define HAVE_SHADER_MANAGER
|
@ -21,25 +21,21 @@
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "rgui.h"
|
||||
#include "menu_context.h"
|
||||
#include "../../file_list.h"
|
||||
#include "../../general.h"
|
||||
#include "../../gfx/gfx_common.h"
|
||||
#include "../../config.def.h"
|
||||
#include "../../file.h"
|
||||
#include "../../dynamic.h"
|
||||
#include "../../compat/posix_string.h"
|
||||
#include "../../gfx/shader_parse.h"
|
||||
#include "../../performance.h"
|
||||
#include "../../input/input_common.h"
|
||||
#include "../menu_common.h"
|
||||
#include "../menu_context.h"
|
||||
#include "../../../file_list.h"
|
||||
#include "../../../general.h"
|
||||
#include "../../../gfx/gfx_common.h"
|
||||
#include "../../../config.def.h"
|
||||
#include "../../../file.h"
|
||||
#include "../../../dynamic.h"
|
||||
#include "../../../compat/posix_string.h"
|
||||
#include "../../../gfx/shader_parse.h"
|
||||
#include "../../../performance.h"
|
||||
#include "../../../input/input_common.h"
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
#include "../../gfx/gl_common.h"
|
||||
#endif
|
||||
|
||||
#include "../../screenshot.h"
|
||||
#include "../../gfx/fonts/bitmap.h"
|
||||
#include "../../../screenshot.h"
|
||||
#include "../../../gfx/fonts/bitmap.h"
|
||||
|
||||
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
|
||||
#define HAVE_SHADER_MANAGER
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "../../ps3/sdk_defines.h"
|
||||
#include "../../ps3/ps3_input.h"
|
||||
#include "../menu/menu_common.h"
|
||||
|
||||
#include "../../console/rarch_console.h"
|
||||
#include "../../conf/config_file.h"
|
||||
|
@ -526,9 +526,9 @@ MENU
|
||||
#include "../file_list.c"
|
||||
|
||||
#if defined(HAVE_RMENU)
|
||||
#include "../frontend/menu/rmenu_disp.c"
|
||||
#include "../frontend/menu/disp/rmenu.c"
|
||||
#elif defined(HAVE_RGUI)
|
||||
#include "../frontend/menu/rgui.c"
|
||||
#include "../frontend/menu/disp/rgui.c"
|
||||
#elif defined(HAVE_RMENU_XUI)
|
||||
#include "../frontend/menu/rmenu_xui.cpp"
|
||||
#endif
|
||||
|
@ -189,7 +189,7 @@
|
||||
<ClCompile Include="..\..\file_extract.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\history.c" />
|
||||
<ClCompile Include="..\..\file_list.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\rgui.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\disp\rgui.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\menu_common.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\menu_settings.c" />
|
||||
<ClCompile Include="..\..\frontend\menu\menu_context.c" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user