libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Nuklear/Zahnrad) Rename to 'nuklear'

Browse Source
This commit is contained in:
twinaphex 2016-04-25 14:58:47 +02:00
parent 68265f6c52
commit 748f5dc74b
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.common
View File

@ -389,8 +389,8 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
HAVE_MATERIALUI = 1 HAVE_MATERIALUI = 1
endif endif
#ifeq ($(HAVE_ZAHNRAD),) #ifeq ($(HAVE_NUKLEAR),)
#HAVE_ZAHNRAD = 1 #HAVE_NUKLEAR = 1
#endif #endif
ifeq ($(HAVE_XMB),) ifeq ($(HAVE_XMB),)
@ -399,7 +399,7 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
else else
HAVE_ZARCH = 0 HAVE_ZARCH = 0
HAVE_MATERIALUI = 0 HAVE_MATERIALUI = 0
#HAVE_ZAHNRAD = 0 #HAVE_NUKLEAR = 0
HAVE_XMB = 0 HAVE_XMB = 0
endif endif
@ -411,11 +411,11 @@ ifeq ($(HAVE_MATERIALUI), 1)
OBJ += menu/drivers/materialui.o OBJ += menu/drivers/materialui.o
DEFINES += -DHAVE_MATERIALUI DEFINES += -DHAVE_MATERIALUI
endif endif
ifeq ($(HAVE_ZAHNRAD), 1) ifeq ($(HAVE_NUKLEAR), 1)
OBJ += menu/drivers/nk_common.o OBJ += menu/drivers/nk_common.o
OBJ += menu/drivers/nk_menu.o OBJ += menu/drivers/nk_menu.o
OBJ += menu/drivers/zr.o OBJ += menu/drivers/nuklear.o
DEFINES += -DHAVE_ZAHNRAD DEFINES += -DHAVE_NUKLEAR
endif endif
ifeq ($(HAVE_ZARCH), 1) ifeq ($(HAVE_ZARCH), 1)
OBJ += menu/drivers/zarch.o OBJ += menu/drivers/zarch.o

1
config.def.h
View File

@ -125,6 +125,7 @@ enum
MENU_XUI, MENU_XUI,
MENU_MATERIALUI, MENU_MATERIALUI,
MENU_XMB, MENU_XMB,
MENU_NUKLEAR,
RECORD_FFMPEG, RECORD_FFMPEG,
RECORD_NULL RECORD_NULL

2
configuration.c
View File

@ -373,6 +373,8 @@ const char *config_get_default_menu(void)
return "glui"; return "glui";
case MENU_XMB: case MENU_XMB:
return "xmb"; return "xmb";
case MENU_NUKLEAR:
return "nuklear";
default: default:
break; break;
} }

4
griffin/griffin.c
View File

@ -895,10 +895,10 @@ MENU
#include "../menu/drivers/materialui.c" #include "../menu/drivers/materialui.c"
#endif #endif
#ifdef HAVE_ZAHNRAD #ifdef HAVE_NUKLEAR
#include "../menu/drivers/nk_common.c" #include "../menu/drivers/nk_common.c"
#include "../menu/drivers/nk_menu.c" #include "../menu/drivers/nk_menu.c"
#include "../menu/drivers/zr.c" #include "../menu/drivers/nuklear.c"
#endif #endif
#ifdef HAVE_ZARCH #ifdef HAVE_ZARCH

4
menu/drivers/zr.c → menu/drivers/nuklear.c
View File

@ -458,7 +458,7 @@ static int zrmenu_iterate(void *data, void *userdata, enum menu_action action)
return 0; return 0;
} }
menu_ctx_driver_t menu_ctx_zr = { menu_ctx_driver_t menu_ctx_nuklear = {
NULL, NULL,
zrmenu_get_message, zrmenu_get_message,
zrmenu_iterate, zrmenu_iterate,
@ -490,7 +490,7 @@ menu_ctx_driver_t menu_ctx_zr = {
NULL, NULL,
NULL, NULL,
NULL, NULL,
"zahnrad", "nuklear",
zrmenu_environ, zrmenu_environ,
NULL, NULL,
}; };

4
menu/menu_driver.c
View File

@ -46,8 +46,8 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#if defined(HAVE_MATERIALUI) #if defined(HAVE_MATERIALUI)
&menu_ctx_mui, &menu_ctx_mui,
#endif #endif
#if defined(HAVE_ZAHNRAD) #if defined(HAVE_NUKLEAR)
&menu_ctx_zr, &menu_ctx_nuklear,
#endif #endif
#if defined(HAVE_XMB) #if defined(HAVE_XMB)
&menu_ctx_xmb, &menu_ctx_xmb,

2
menu/menu_driver.h
View File

@ -471,7 +471,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
extern menu_ctx_driver_t menu_ctx_xui; extern menu_ctx_driver_t menu_ctx_xui;
extern menu_ctx_driver_t menu_ctx_rgui; extern menu_ctx_driver_t menu_ctx_rgui;
extern menu_ctx_driver_t menu_ctx_mui; extern menu_ctx_driver_t menu_ctx_mui;
extern menu_ctx_driver_t menu_ctx_zr; extern menu_ctx_driver_t menu_ctx_nuklear;
extern menu_ctx_driver_t menu_ctx_xmb; extern menu_ctx_driver_t menu_ctx_xmb;
extern menu_ctx_driver_t menu_ctx_zarch; extern menu_ctx_driver_t menu_ctx_zarch;
extern menu_ctx_driver_t menu_ctx_null; extern menu_ctx_driver_t menu_ctx_null;

2
qb/config.params.sh
View File

@ -3,7 +3,7 @@ HAVE_RGUI=yes # RGUI menu
HAVE_MATERIALUI=auto # MaterialUI menu HAVE_MATERIALUI=auto # MaterialUI menu
HAVE_CHEEVOS=no # Cheevos (achievements) HAVE_CHEEVOS=no # Cheevos (achievements)
HAVE_XMB=auto # XMB menu HAVE_XMB=auto # XMB menu
HAVE_ZAHNRAD=no # Zahnrad menu HAVE_NUKLEAR=no # Nuklear menu
HAVE_DYNAMIC=yes # Dynamic loading of libretro library HAVE_DYNAMIC=yes # Dynamic loading of libretro library
HAVE_SDL=auto # SDL support HAVE_SDL=auto # SDL support
C89_SDL=no C89_SDL=no