ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Xbox build fix

This commit is contained in:
twinaphex 2013-04-13 23:51:13 +02:00
parent 0fa54e6db0
commit 23fff4cb9d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/menu/rmenu.c
View File

@ -364,9 +364,11 @@ static void menu_stack_push(unsigned menu_type, bool prev_dir)
case INGAME_MENU: case INGAME_MENU:
selected = FIRST_INGAME_MENU_SETTING; selected = FIRST_INGAME_MENU_SETTING;
break; break;
#ifdef HAVE_SHADER_MANAGER
case INGAME_MENU_SHADER_MANAGER: case INGAME_MENU_SHADER_MANAGER:
selected = FIRST_SHADERMAN_SETTING; selected = FIRST_SHADERMAN_SETTING;
break; break;
#endif
case GENERAL_VIDEO_MENU: case GENERAL_VIDEO_MENU:
selected = FIRST_VIDEO_SETTING; selected = FIRST_VIDEO_SETTING;
break; break;
@ -2606,8 +2608,12 @@ static int select_setting(uint8_t menu_type, uint64_t input)
else if (input & (1ULL << RMENU_DEVICE_NAV_R1)) else if (input & (1ULL << RMENU_DEVICE_NAV_R1))
{ {
if (menu_type != CONTROLS_MENU || menu_type != INGAME_MENU_SHADER_MANAGER if (menu_type != CONTROLS_MENU
|| menu_type != INGAME_MENU) #ifdef HAVE_SHADER_MANAGER
|| menu_type != INGAME_MENU_SHADER_MANAGER
#endif
|| menu_type != INGAME_MENU
)
menu_stack_push(menu_type + 1, false); menu_stack_push(menu_type + 1, false);
} }
@ -3334,9 +3340,9 @@ bool menu_iterate(void)
case LIBRETRO_CHOICE: case LIBRETRO_CHOICE:
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
case CGP_CHOICE: case CGP_CHOICE:
case SHADER_CHOICE:
#endif #endif
case INPUT_PRESET_CHOICE: case INPUT_PRESET_CHOICE:
case SHADER_CHOICE:
case BORDER_CHOICE: case BORDER_CHOICE:
input_entry_ret = select_file(menu_type, input); input_entry_ret = select_file(menu_type, input);
break; break;