diff --git a/Makefile.common b/Makefile.common
index 6a6e0e138d..9a0272734f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -372,8 +372,8 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
HAVE_ZARCH = 1
endif
- ifeq ($(HAVE_GLUI),)
- HAVE_GLUI = 1
+ ifeq ($(HAVE_MATERIALUI),)
+ HAVE_MATERIALUI = 1
endif
ifeq ($(HAVE_XMB),)
@@ -381,7 +381,7 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
endif
else
HAVE_ZARCH = 0
- HAVE_GLUI = 0
+ HAVE_MATERIALUI = 0
HAVE_XMB = 0
endif
@@ -389,9 +389,9 @@ ifeq ($(HAVE_RGUI), 1)
OBJ += menu/drivers/rgui.o
DEFINES += -DHAVE_MENU -DHAVE_RGUI
HAVE_MENU_COMMON = 1
-ifeq ($(HAVE_GLUI), 1)
+ifeq ($(HAVE_MATERIALUI), 1)
OBJ += menu/drivers/materialui.o
- DEFINES += -DHAVE_GLUI
+ DEFINES += -DHAVE_MATERIALUI
endif
ifeq ($(HAVE_ZARCH), 1)
OBJ += menu/drivers/zarch.o
diff --git a/Makefile.ps3 b/Makefile.ps3
index 1eac9519e5..f807b7f687 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -68,7 +68,7 @@ ifeq ($(HAVE_RLAUNCH), 1)
DEFINES += -DHAVE_RLAUNCH
endif
-DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_GLUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT
+DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_MATERIALUI -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_STB_FONT
ifeq ($(HAVE_GCMGL), 1)
DEFINES += -DHAVE_GCMGL
diff --git a/Makefile.win b/Makefile.win
index a729510308..4312df9b9a 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -14,7 +14,7 @@ HAVE_STDIN_CMD = 1
HAVE_COMMAND = 1
HAVE_THREADS = 1
HAVE_RGUI = 1
-HAVE_GLUI = 1
+HAVE_MATERIALUI = 1
HAVE_7ZIP = 1
HAVE_ZLIB_DEFLATE = 1
HAVE_PYTHON = 0
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5e5d333dcb..0a615bfac9 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -833,7 +833,7 @@ MENU
#include "../menu/drivers/xmb.c"
#endif
-#ifdef HAVE_GLUI
+#ifdef HAVE_MATERIALUI
#include "../menu/drivers/materialui.c"
#endif
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 6581706475..a6f70e4d39 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -30,7 +30,7 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#if defined(HAVE_RMENU_XUI)
&menu_ctx_rmenu_xui,
#endif
-#if defined(HAVE_GLUI)
+#if defined(HAVE_MATERIALUI)
&menu_ctx_materialui,
#endif
#if defined(HAVE_XMB)
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 4ed86bedae..905ab0b6a1 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -65,7 +65,7 @@ else
endif
-LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
LOCAL_CFLAGS += -DHAVE_7ZIP
LOCAL_CFLAGS += -DHAVE_CHEEVOS
diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk
index 0d50f750e3..9e97206c1a 100644
--- a/pkg/android/phoenix/jni/Android2.mk
+++ b/pkg/android/phoenix/jni/Android2.mk
@@ -65,7 +65,7 @@ else
endif
-LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_GLUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
LOCAL_CFLAGS += -DHAVE_7ZIP
LOCAL_CFLAGS += -DHAVE_CHEEVOS
LOCAL_CFLAGS += -DDEBUG_ANDROID
diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
index ef51e68b8b..5797e4b290 100644
--- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
@@ -411,7 +411,7 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
@@ -472,7 +472,7 @@
"-DHAVE_DYLIB",
"-DHAVE_CG",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
@@ -534,7 +534,7 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
@@ -594,7 +594,7 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
index f3e47fa87a..2658f8054f 100644
--- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
@@ -309,7 +309,7 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
@@ -377,7 +377,7 @@
"-DHAVE_THREADS",
"-DHAVE_DYLIB",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_HID",
"-DHAVE_XMB",
diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
index 1988aa713c..18db626928 100644
--- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
@@ -547,7 +547,7 @@
"-DRARCH_INTERNAL",
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -620,7 +620,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -663,7 +663,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -735,7 +735,7 @@
"-DRARCH_INTERNAL",
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -804,7 +804,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -845,7 +845,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -1044,7 +1044,7 @@
"-DRARCH_INTERNAL",
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -1116,7 +1116,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
@@ -1159,7 +1159,7 @@
"-DHAVE_THREADS",
"-DHAVE_FILTERS_BUILTIN",
"-DHAVE_7ZIP",
- "-DHAVE_GLUI",
+ "-DHAVE_MATERIALUI",
"-DHAVE_ZARCH",
"-DHAVE_XMB",
"-D_LZMA_UINT32_IS_ULONG",
diff --git a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 43ca34aba5..7d6c8eb6bb 100644
--- a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -100,7 +100,7 @@
Level3
Disabled
- WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_XMB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB;HAVE_STB_FONT
+ WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_XMB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories)
MultiThreadedDebug
CompileAsCpp
@@ -120,7 +120,7 @@
Level3
Disabled
- WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB;HAVE_STB_FONT
+ WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories)
MultiThreadedDebug
CompileAsCpp
@@ -142,7 +142,7 @@
MaxSpeed
true
true
- WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_RPNG;HAVE_XMB;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB;HAVE_STB_FONT
+ WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_GRIFFIN;HAVE_FBO;HAVE_RPNG;HAVE_XMB;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories)
MultiThreaded
CompileAsCpp
@@ -167,7 +167,7 @@
MaxSpeed
true
true
- WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_GLUI;HAVE_LIBRETRODB;HAVE_STB_FONT
+ WIN32;RARCH_INTERNAL;HAVE_D3D;HAVE_D3D9;HAVE_CG;HAVE_GLSL;HAVE_GRIFFIN;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;WANT_ZLIB;HAVE_FBO;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_BUILTIN_AUTOCONFIG;HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETPLAY;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT
$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\gfx\inc;%(AdditionalIncludeDirectories)
MultiThreaded
CompileAsCpp
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 767575f51e..bb802c6b9b 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -390,17 +390,17 @@ check_lib MMAP "$CLIB" mmap
check_pkgconf PYTHON python3
-if [ "$HAVE_GLUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH" != 'no' ]; then
+if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH" != 'no' ]; then
if [ "$HAVE_RGUI" = 'no' ]; then
- HAVE_GLUI=no
+ HAVE_MATERIALUI=no
HAVE_XMB=no
HAVE_ZARCH=no
- echo "Notice: RGUI not available, GLUI, XMB and ZARCH will be disabled."
+ echo "Notice: RGUI not available, MaterialUI, XMB and ZARCH will be disabled."
elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_GLES" = 'no' ]; then
- HAVE_GLUI=no
+ HAVE_MATERIALUI=no
HAVE_XMB=no
HAVE_ZARCH=no
- echo "Notice: GL/GLES not available, XMB, GLUI and ZARCH will be disabled."
+ echo "Notice: GL/GLES not available, XMB, MaterialUI and ZARCH will be disabled."
fi
fi
diff --git a/qb/config.params.sh b/qb/config.params.sh
index e596596032..82f0ebae3f 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -1,6 +1,6 @@
HAVE_LIBRETRODB=yes # Disable libretrodb
-HAVE_RGUI=yes # Disable RGUI
-HAVE_GLUI=auto # Enable GLUI menu
+HAVE_RGUI=yes # Disable RGUI menu
+HAVE_MATERIALUI=auto # Enable MaterialUI menu
HAVE_CHEEVOS=no # Enable Cheevos (achievements)
HAVE_XMB=auto # Enable XMB menu
HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library