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

Make it possible to compile without menu support again

Browse Source
This commit is contained in:
twinaphex 2014-09-28 18:01:59 +02:00
parent cdefbcfc61
commit 3c8cc513ab
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/frontend.c
View File

@ -18,6 +18,7 @@
#include "../driver.h"
#include "frontend.h"
#include "../general.h"
#include "../performance.h"
#if defined(HAVE_MENU)
#include "menu/menu_input_line_cb.h"

6
retroarch.c
View File

@ -164,10 +164,12 @@ static void take_screenshot(void)
if (viewport_read)
{
#ifdef HAVE_MENU
/* Avoid taking screenshot of GUI overlays. */
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data,
false, false);
#endif
if (driver.video)
rarch_render_cached_frame();
@ -3176,7 +3178,9 @@ void rarch_main_command(unsigned cmd)
save_core_config();
break;
case RARCH_CMD_SHADERS_APPLY_CHANGES:
#ifdef HAVE_MENU
menu_shader_manager_apply_changes();
#endif
break;
}
}
@ -3197,6 +3201,7 @@ bool rarch_main_iterate(void)
!driver.video->alive(driver.video_data))
return false;
#ifdef HAVE_MENU
if (g_extern.is_menu)
{
if (
@ -3223,6 +3228,7 @@ bool rarch_main_iterate(void)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT);
return true; /* Enter menu on next run. */
}
#endif
if (g_extern.exec)
{

5
settings_data.c
View File

@ -1809,6 +1809,7 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
#endif
#ifdef HAVE_MENU
static void menu_common_setting_set_label_perf(char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const struct retro_perf_counter **counters, unsigned offset)
@ -1832,7 +1833,6 @@ static void menu_common_setting_set_label_perf(char *type_str,
}
}
void setting_data_get_label(char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned index)
@ -1846,10 +1846,8 @@ void setting_data_get_label(char *type_str,
!strcmp(menu_label, "video_shader_preset_parameters"))
)
{
#ifdef HAVE_MENU
menu_shader_manager_get_str(driver.menu->shader, type_str, type_str_size,
menu_label, label, type);
#endif
}
else if (!strcmp(label, "input_bind_device_id"))
{
@ -2000,6 +1998,7 @@ void setting_data_get_label(char *type_str,
}
}
}
#endif
static void general_read_handler(void *data)
{

6
settings_data.h
View File

@ -183,12 +183,12 @@ rarch_setting_t setting_data_bind_setting(const char* name,
int setting_data_get_description(const char *label, char *msg,
size_t msg_sizeof);
#ifdef HAVE_MENU
rarch_setting_t* setting_data_get_mainmenu(bool regenerate);
void setting_data_get_label(char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned index);
#ifdef HAVE_MENU
rarch_setting_t* setting_data_get_mainmenu(bool regenerate);
#endif
rarch_setting_t* setting_data_get_list(void);