mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9148 from orbea/menu

Browse Source 
Correctly fixes --disable-menu.
This commit is contained in:
Twinaphex 2019-07-21 11:48:13 +02:00 committed by GitHub
commit 72a47797bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.common
View File

@ -348,7 +348,6 @@ ifeq ($(HAVE_SLANG), 1)
HAVE_SHADERS_COMMON = 1
endif
# Qt WIMP GUI
ifeq ($(HAVE_OPENSSL), 1)
@ -791,6 +790,11 @@ ifeq ($(HAVE_LAKKA_SWITCH), 1)
DEFINES += -DHAVE_LAKKA_SWITCH
endif
# Does not depend on HAVE_MENU
ifeq ($(HAVE_SHADERS_COMMON),1)
OBJ += menu/menu_shader.o
endif
ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/menu_driver.o \
menu/menu_content.o \
@ -824,11 +828,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/drivers/menu_generic.o \
menu/drivers/null.o \
menu/menu_thumbnail_path.o \
menu/drivers_display/menu_display_null.o
ifeq ($(HAVE_SHADERS_COMMON),1)
OBJ += menu/menu_shader.o
endif
menu/drivers_display/menu_display_null.o
ifeq ($(HAVE_MENU_WIDGETS), 1)
OBJ += menu/widgets/menu_widgets.o

2
tasks/task_content.c
View File

@ -629,10 +629,8 @@ static bool content_load(content_ctx_info_t *info)
content_clear_subsystem();
}
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
menu_shader_manager_init();
#endif
#endif
command_event(CMD_EVENT_HISTORY_INIT, NULL);