gaming/RetroArch
gaming/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-07-05 09:48:42 +00:00
Code Issues Projects Releases Wiki Activity

Clone xmb to stripe menu

Browse Source
This commit is contained in:
Jean-André Santoni 2018-04-08 09:55:16 +07:00
parent c570d461af
commit 1614519874
11 changed files with 5365 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

251
.vscode/c_cpp_properties.json vendored
View File

@ -1,125 +1,128 @@
{ {
"configurations": [ "configurations": [
{ {
"name": "Mac", "name": "Mac",
"includePath": [ "includePath": [
"/usr/include", "/usr/include",
"/usr/local/include", "/usr/local/include",
"${workspaceRoot}" "${workspaceRoot}"
], ],
"defines": [], "defines": [],
"intelliSenseMode": "clang-x64", "intelliSenseMode": "clang-x64",
"browse": { "browse": {
"path": [ "path": [
"/usr/include", "/usr/include",
"/usr/local/include", "/usr/local/include",
"${workspaceRoot}" "${workspaceRoot}"
], ],
"limitSymbolsToIncludedHeaders": true, "limitSymbolsToIncludedHeaders": true,
"databaseFilename": "" "databaseFilename": ""
}, },
"macFrameworkPath": [ "macFrameworkPath": [
"/System/Library/Frameworks", "/System/Library/Frameworks",
"/Library/Frameworks" "/Library/Frameworks"
] ],
}, "compilerPath": "/usr/bin/clang",
{ "cStandard": "c11",
"name": "Linux", "cppStandard": "c++17"
"includePath": [ },
"/usr/include", {
"/usr/local/include", "name": "Linux",
"${workspaceRoot}" "includePath": [
], "/usr/include",
"defines": [], "/usr/local/include",
"intelliSenseMode": "clang-x64", "${workspaceRoot}"
"browse": { ],
"path": [ "defines": [],
"/usr/include", "intelliSenseMode": "clang-x64",
"/usr/local/include", "browse": {
"${workspaceRoot}" "path": [
], "/usr/include",
"limitSymbolsToIncludedHeaders": true, "/usr/local/include",
"databaseFilename": "" "${workspaceRoot}"
} ],
}, "limitSymbolsToIncludedHeaders": true,
{ "databaseFilename": ""
"name": "Win32", }
"includePath": [ },
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um", {
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt", "name": "Win32",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared", "includePath": [
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt", "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
"${workspaceRoot}" "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
], "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
"defines": [ "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
"_DEBUG", "${workspaceRoot}"
"UNICODE" ],
], "defines": [
"intelliSenseMode": "msvc-x64", "_DEBUG",
"browse": { "UNICODE"
"path": [ ],
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um", "intelliSenseMode": "msvc-x64",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt", "browse": {
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared", "path": [
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt", "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/um",
"${workspaceRoot}" "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
], "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
"limitSymbolsToIncludedHeaders": true, "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
"databaseFilename": "" "${workspaceRoot}"
} ],
}, "limitSymbolsToIncludedHeaders": true,
{ "databaseFilename": ""
"name": "msys2-mingw32", }
"includePath": [ },
"C:/msys64/mingw32/include", {
"C:/msys64/mingw32/i686-w64-mingw32/include", "name": "msys2-mingw32",
"${workspaceRoot}/libretro-common/include", "includePath": [
"${workspaceRoot}/include", "C:/msys64/mingw32/include",
"${workspaceRoot}" "C:/msys64/mingw32/i686-w64-mingw32/include",
], "${workspaceRoot}/libretro-common/include",
"defines": [ "${workspaceRoot}/include",
"_DEBUG", "${workspaceRoot}"
"UNICODE" ],
], "defines": [
"intelliSenseMode": "msvc-x64", "_DEBUG",
"browse": { "UNICODE"
"path": [ ],
"C:/msys64/mingw32/include", "intelliSenseMode": "msvc-x64",
"C:/msys64/mingw32/i686-w64-mingw32/include", "browse": {
"${workspaceRoot}/libretro-common/include", "path": [
"${workspaceRoot}/include", "C:/msys64/mingw32/include",
"${workspaceRoot}" "C:/msys64/mingw32/i686-w64-mingw32/include",
], "${workspaceRoot}/libretro-common/include",
"limitSymbolsToIncludedHeaders": true, "${workspaceRoot}/include",
"databaseFilename": "" "${workspaceRoot}"
} ],
}, "limitSymbolsToIncludedHeaders": true,
{ "databaseFilename": ""
"name": "msys2-mingw64", }
"includePath": [ },
"C:/msys64/mingw64/include", {
"C:/msys64/mingw64/x86_64-w64-mingw32/include", "name": "msys2-mingw64",
"${workspaceRoot}/libretro-common/include", "includePath": [
"${workspaceRoot}/include", "C:/msys64/mingw64/include",
"${workspaceRoot}" "C:/msys64/mingw64/x86_64-w64-mingw32/include",
], "${workspaceRoot}/libretro-common/include",
"defines": [ "${workspaceRoot}/include",
"_DEBUG", "${workspaceRoot}"
"UNICODE" ],
], "defines": [
"intelliSenseMode": "msvc-x64", "_DEBUG",
"browse": { "UNICODE"
"path": [ ],
"C:/msys64/mingw64/include", "intelliSenseMode": "msvc-x64",
"C:/msys64/mingw64/x86_64-w64-mingw32/include", "browse": {
"${workspaceRoot}/libretro-common/include", "path": [
"${workspaceRoot}/include", "C:/msys64/mingw64/include",
"${workspaceRoot}" "C:/msys64/mingw64/x86_64-w64-mingw32/include",
], "${workspaceRoot}/libretro-common/include",
"limitSymbolsToIncludedHeaders": true, "${workspaceRoot}/include",
"databaseFilename": "" "${workspaceRoot}"
} ],
} "limitSymbolsToIncludedHeaders": true,
], "databaseFilename": ""
"version": 3 }
}
],
"version": 3
} }

11
Makefile.common
View File

@ -724,11 +724,16 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
ifeq ($(HAVE_XMB),) ifeq ($(HAVE_XMB),)
HAVE_XMB = 1 HAVE_XMB = 1
endif endif
ifeq ($(HAVE_STRIPES),)
HAVE_STRIPES = 1
endif
else else
HAVE_ZARCH ?= 0 HAVE_ZARCH ?= 0
HAVE_MATERIALUI ?= 0 HAVE_MATERIALUI ?= 0
#HAVE_NUKLEAR ?= 0 #HAVE_NUKLEAR ?= 0
HAVE_XMB ?= 0 HAVE_XMB ?= 0
HAVE_STRIPES ?= 0
endif endif
ifeq ($(HAVE_RGUI), 1) ifeq ($(HAVE_RGUI), 1)
@ -760,6 +765,12 @@ ifeq ($(HAVE_XMB), 1)
HAVE_MENU_COMMON = 1 HAVE_MENU_COMMON = 1
endif endif
ifeq ($(HAVE_STRIPES), 1)
OBJ += menu/drivers/stripes.o
DEFINES += -DHAVE_STRIPES
HAVE_MENU_COMMON = 1
endif
ifeq ($(HAVE_LAKKA), 1) ifeq ($(HAVE_LAKKA), 1)
DEFINES += -DHAVE_LAKKA DEFINES += -DHAVE_LAKKA
endif endif

5
configuration.c
View File

@ -271,6 +271,7 @@ enum menu_driver_enum
MENU_XUI, MENU_XUI,
MENU_MATERIALUI, MENU_MATERIALUI,
MENU_XMB, MENU_XMB,
MENU_STRIPES,
MENU_NUKLEAR, MENU_NUKLEAR,
MENU_NULL MENU_NULL
}; };
@ -502,6 +503,8 @@ static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI; static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
#elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE) #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI; static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI;
#elif defined(HAVE_STRIPES) && !defined(_XBOX)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
#elif defined(HAVE_XMB) && !defined(_XBOX) #elif defined(HAVE_XMB) && !defined(_XBOX)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB; static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
#elif defined(HAVE_RGUI) #elif defined(HAVE_RGUI)
@ -995,6 +998,8 @@ const char *config_get_default_menu(void)
return "glui"; return "glui";
case MENU_XMB: case MENU_XMB:
return "xmb"; return "xmb";
case MENU_STRIPES:
return "stripes";
case MENU_NUKLEAR: case MENU_NUKLEAR:
return "nuklear"; return "nuklear";
case MENU_NULL: case MENU_NULL:

4
file_path_special.c
View File

@ -130,6 +130,10 @@ bool fill_pathname_application_data(char *s, size_t len)
const char* xmb_theme_ident(void); const char* xmb_theme_ident(void);
#endif #endif
#ifdef HAVE_STRIPES
const char* stripes_theme_ident(void);
#endif
void fill_pathname_application_special(char *s, void fill_pathname_application_special(char *s,
size_t len, enum application_special_type type) size_t len, enum application_special_type type)
{ {

4
griffin/griffin.c
View File

@ -1220,6 +1220,10 @@ MENU
#include "../menu/drivers/xmb.c" #include "../menu/drivers/xmb.c"
#endif #endif
#ifdef HAVE_STRIPES
#include "../menu/drivers/stripes.c"
#endif
#ifdef HAVE_MATERIALUI #ifdef HAVE_MATERIALUI
#include "../menu/drivers/materialui.c" #include "../menu/drivers/materialui.c"
#endif #endif

5205
menu/drivers/stripes.c Executable file
View File

File diff suppressed because it is too large Load Diff

3
menu/menu_driver.c
View File

@ -81,6 +81,9 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
#if defined(HAVE_XMB) #if defined(HAVE_XMB)
&menu_ctx_xmb, &menu_ctx_xmb,
#endif #endif
#if defined(HAVE_STRIPES)
&menu_ctx_stripes,
#endif
#if defined(HAVE_RGUI) #if defined(HAVE_RGUI)
&menu_ctx_rgui, &menu_ctx_rgui,
#endif #endif

1
menu/menu_driver.h
View File

@ -771,6 +771,7 @@ 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_nuklear; 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_stripes;
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;

4
pkg/apple/RetroArch.xcodeproj/project.pbxproj
View File

@ -539,7 +539,7 @@
"-DHAVE_MATERIALUI", "-DHAVE_MATERIALUI",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_XMB", "-DHAVE_XMB",
"-DHAVE_SEGA", "-DHAVE_STRIPES",
"-DHAVE_SHADERPIPELINE", "-DHAVE_SHADERPIPELINE",
"-DHAVE_MMAP", "-DHAVE_MMAP",
"-DHAVE_LIBRETRODB", "-DHAVE_LIBRETRODB",
@ -600,7 +600,7 @@
"-DHAVE_MATERIALUI", "-DHAVE_MATERIALUI",
"-DHAVE_HID", "-DHAVE_HID",
"-DHAVE_XMB", "-DHAVE_XMB",
"-DHAVE_SEGA", "-DHAVE_STRIPES",
"-DHAVE_SHADERPIPELINE", "-DHAVE_SHADERPIPELINE",
"-DHAVE_MMAP", "-DHAVE_MMAP",
"-DHAVE_LIBRETRODB", "-DHAVE_LIBRETRODB",

2
qb/config.libs.sh
View File

@ -477,6 +477,7 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
if [ "$HAVE_RGUI" = 'no' ]; then if [ "$HAVE_RGUI" = 'no' ]; then
HAVE_MATERIALUI=no HAVE_MATERIALUI=no
HAVE_XMB=no HAVE_XMB=no
HAVE_STRIPES=no
HAVE_ZARCH=no HAVE_ZARCH=no
die : 'Notice: RGUI not available, MaterialUI, XMB and ZARCH will also be disabled.' die : 'Notice: RGUI not available, MaterialUI, XMB and ZARCH will also be disabled.'
elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
@ -489,6 +490,7 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
else else
HAVE_MATERIALUI=no HAVE_MATERIALUI=no
HAVE_XMB=no HAVE_XMB=no
HAVE_STRIPES=no
HAVE_ZARCH=no HAVE_ZARCH=no
die : 'Notice: Hardware rendering context not available, XMB, MaterialUI and ZARCH will also be disabled.' die : 'Notice: Hardware rendering context not available, XMB, MaterialUI and ZARCH will also be disabled.'
fi fi

1
qb/config.params.sh
View File

@ -9,6 +9,7 @@ HAVE_LIBRETRODB=yes # Libretrodb support
HAVE_RGUI=yes # RGUI menu HAVE_RGUI=yes # RGUI menu
HAVE_MATERIALUI=auto # MaterialUI menu HAVE_MATERIALUI=auto # MaterialUI menu
HAVE_XMB=auto # XMB menu HAVE_XMB=auto # XMB menu
HAVE_STRIPES=auto # Stripes menu
HAVE_ZARCH=no # Zarch menu HAVE_ZARCH=no # Zarch menu
HAVE_NUKLEAR=no # Nuklear menu HAVE_NUKLEAR=no # Nuklear menu
HAVE_RUNAHEAD=yes # Runahead support HAVE_RUNAHEAD=yes # Runahead support