From 6b0ebb7a030595a5989209ec016197042ac511d3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 Nov 2015 12:04:02 +0100 Subject: [PATCH] Update some references to GLUI --- Makefile.common | 2 +- config.def.h | 4 ++-- configuration.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.common b/Makefile.common index c69ddc6252..c5b0985843 100644 --- a/Makefile.common +++ b/Makefile.common @@ -365,7 +365,7 @@ ifeq ($(HAVE_NEON),1) OBJ += audio/audio_utils_neon.o endif -# XMB and GLUI are always enabled if supported and not explicitly disabled +# XMB and MaterialUI are always enabled if supported and not explicitly disabled ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11) ifeq ($(HAVE_ZARCH),) HAVE_ZARCH = 1 diff --git a/config.def.h b/config.def.h index de8524f3bc..81bbddf979 100644 --- a/config.def.h +++ b/config.def.h @@ -124,7 +124,7 @@ enum MENU_RGUI, MENU_RMENU, MENU_RMENU_XUI, - MENU_GLUI, + MENU_MATERIALUI, MENU_XMB, RECORD_FFMPEG, @@ -318,7 +318,7 @@ enum #elif defined(HAVE_RMENU_XUI) #define MENU_DEFAULT_DRIVER MENU_RMENU_XUI #elif defined(IOS) || defined(ANDROID) || defined(__CELLOS_LV2__) -#define MENU_DEFAULT_DRIVER MENU_GLUI +#define MENU_DEFAULT_DRIVER MENU_MATERIALUI #elif defined(MAC_OS_X_VERSION_10_6) #define MENU_DEFAULT_DRIVER MENU_XMB #else diff --git a/configuration.c b/configuration.c index f416df38d7..553d4508b0 100644 --- a/configuration.c +++ b/configuration.c @@ -345,7 +345,7 @@ const char *config_get_default_menu(void) return "rmenu"; case MENU_RMENU_XUI: return "rmenu_xui"; - case MENU_GLUI: + case MENU_MATERIALUI: return "glui"; case MENU_XMB: return "xmb";