From acb201648a8e7d8dd3ec580b3676939cb9615727 Mon Sep 17 00:00:00 2001 From: ToadKing Date: Sun, 29 Sep 2013 21:54:08 -0400 Subject: [PATCH] [GX] fix compile --- frontend/menu/menu_common.h | 34 ++++++++++++++++++++++++++++++++++ frontend/menu/rgui.c | 26 -------------------------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 53a3d495d8..c2fb9b1080 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -186,6 +186,35 @@ typedef enum RGUI_ACTION_NOOP } rgui_action_t; + +#ifdef GEKKO +enum +{ + GX_RESOLUTIONS_512_192 = 0, + GX_RESOLUTIONS_598_200, + GX_RESOLUTIONS_640_200, + GX_RESOLUTIONS_384_224, + GX_RESOLUTIONS_448_224, + GX_RESOLUTIONS_480_224, + GX_RESOLUTIONS_512_224, + GX_RESOLUTIONS_340_232, + GX_RESOLUTIONS_512_232, + GX_RESOLUTIONS_512_236, + GX_RESOLUTIONS_336_240, + GX_RESOLUTIONS_384_240, + GX_RESOLUTIONS_512_240, + GX_RESOLUTIONS_576_224, + GX_RESOLUTIONS_608_224, + GX_RESOLUTIONS_640_224, + GX_RESOLUTIONS_530_240, + GX_RESOLUTIONS_640_240, + GX_RESOLUTIONS_512_448, + GX_RESOLUTIONS_640_448, + GX_RESOLUTIONS_640_480, + GX_RESOLUTIONS_LAST, +}; +#endif + typedef struct { uint64_t old_input_state; @@ -239,6 +268,11 @@ typedef struct extern rgui_handle_t *rgui; +#ifdef GEKKO +extern unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2]; +extern unsigned rgui_current_gx_resolution; +#endif + void menu_init(void); bool menu_iterate(void); void menu_free(void); diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index 06fbafafd5..f63be960c1 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -41,32 +41,6 @@ #include "../../screenshot.h" #ifdef GEKKO -enum -{ - GX_RESOLUTIONS_512_192 = 0, - GX_RESOLUTIONS_598_200, - GX_RESOLUTIONS_640_200, - GX_RESOLUTIONS_384_224, - GX_RESOLUTIONS_448_224, - GX_RESOLUTIONS_480_224, - GX_RESOLUTIONS_512_224, - GX_RESOLUTIONS_340_232, - GX_RESOLUTIONS_512_232, - GX_RESOLUTIONS_512_236, - GX_RESOLUTIONS_336_240, - GX_RESOLUTIONS_384_240, - GX_RESOLUTIONS_512_240, - GX_RESOLUTIONS_576_224, - GX_RESOLUTIONS_608_224, - GX_RESOLUTIONS_640_224, - GX_RESOLUTIONS_530_240, - GX_RESOLUTIONS_640_240, - GX_RESOLUTIONS_512_448, - GX_RESOLUTIONS_640_448, - GX_RESOLUTIONS_640_480, - GX_RESOLUTIONS_LAST, -}; - unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2] = { { 512, 192 }, { 598, 200 },