From 7411d140f8fa508b9af70edfc7af752eb10140e2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 11 Jan 2013 04:39:24 +0100 Subject: [PATCH] Fix PC build --- console/rarch_console.h | 14 -------------- general.h | 14 ++++++++++++++ retroarch.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/console/rarch_console.h b/console/rarch_console.h index 1168f2efea..b7d2f79cd3 100644 --- a/console/rarch_console.h +++ b/console/rarch_console.h @@ -66,20 +66,6 @@ enum { MENU_ITEM_LAST }; -enum -{ - MODE_EMULATION = 0, - MODE_LOAD_GAME, - MODE_INIT, - MODE_MENU, - MODE_MENU_PREINIT, - MODE_MENU_INGAME, - MODE_MENU_DRAW, - MODE_EXIT, - MODE_LOAD_FIRST_SHADER, - MODE_LOAD_SECOND_SHADER, -}; - enum { SOUND_MODE_NORMAL, diff --git a/general.h b/general.h index 06a6642932..1b9221fad4 100644 --- a/general.h +++ b/general.h @@ -100,6 +100,20 @@ enum dpad_emu_enums DPAD_EMULATION_LAST }; +enum menu_enums +{ + MODE_EMULATION = 0, + MODE_LOAD_GAME, + MODE_INIT, + MODE_MENU, + MODE_MENU_PREINIT, + MODE_MENU_INGAME, + MODE_MENU_DRAW, + MODE_EXIT, + MODE_LOAD_FIRST_SHADER, + MODE_LOAD_SECOND_SHADER, +}; + // All config related settings go here. struct settings { diff --git a/retroarch.c b/retroarch.c index 2750149d58..78018c75e2 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2801,8 +2801,8 @@ bool rarch_main_iterate(void) g_extern.lifecycle_menu_state |= (1 << MODE_MENU); g_extern.delay_timer[0] = g_extern.frame_count + 30; } -#endif else +#endif g_extern.lifecycle_menu_state |= (1 << MODE_EXIT); return false; }