diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 9c2bbd47b2..0e9b5d8039 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -318,11 +318,6 @@ 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/menu_settings.c b/frontend/menu/menu_settings.c index 922859b468..de739e1694 100644 --- a/frontend/menu/menu_settings.c +++ b/frontend/menu/menu_settings.c @@ -22,6 +22,32 @@ #ifdef GEKKO #define MAX_GAMMA_SETTING 2 + +static unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2] = { + { 512, 192 }, + { 598, 200 }, + { 640, 200 }, + { 384, 224 }, + { 448, 224 }, + { 480, 224 }, + { 512, 224 }, + { 340, 232 }, + { 512, 232 }, + { 512, 236 }, + { 336, 240 }, + { 384, 240 }, + { 512, 240 }, + { 576, 224 }, + { 608, 224 }, + { 640, 224 }, + { 530, 240 }, + { 640, 240 }, + { 512, 448 }, + { 640, 448 }, + { 640, 480 }, +}; + +static unsigned rgui_current_gx_resolution = GX_RESOLUTIONS_640_480; #else #define MAX_GAMMA_SETTING 1 #endif diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c index fe62fea1a5..38b34833ec 100644 --- a/frontend/menu/rgui.c +++ b/frontend/menu/rgui.c @@ -41,34 +41,6 @@ #include "../../screenshot.h" -#ifdef GEKKO -unsigned rgui_gx_resolutions[GX_RESOLUTIONS_LAST][2] = { - { 512, 192 }, - { 598, 200 }, - { 640, 200 }, - { 384, 224 }, - { 448, 224 }, - { 480, 224 }, - { 512, 224 }, - { 340, 232 }, - { 512, 232 }, - { 512, 236 }, - { 336, 240 }, - { 384, 240 }, - { 512, 240 }, - { 576, 224 }, - { 608, 224 }, - { 640, 224 }, - { 530, 240 }, - { 640, 240 }, - { 512, 448 }, - { 640, 448 }, - { 640, 480 }, -}; - -unsigned rgui_current_gx_resolution = GX_RESOLUTIONS_640_480; -#endif - #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #define HAVE_SHADER_MANAGER #endif