Merge pull request #2489 from fr500/master

build remote gamepad for android
This commit is contained in:
Andrés 2015-11-27 21:05:55 -05:00
commit 7b4be66dab
4 changed files with 5 additions and 2 deletions

View File

@ -1424,6 +1424,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Overlay support";
case MENU_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT:
return "Command interface support";
case MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT:
return "Network Gamepad support";
case MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT:
return "Network Command interface support";
case MENU_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT:

View File

@ -591,7 +591,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
snprintf(feat_str, sizeof(feat_str),
"%s : %s",
menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT),
menu_hash_to_str(MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT),
_network_gamepad_supp ? menu_hash_to_str(MENU_LABEL_VALUE_YES) : menu_hash_to_str(MENU_LABEL_VALUE_NO));
menu_entries_push(info->list, feat_str, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);

View File

@ -991,6 +991,7 @@ extern "C" {
#define MENU_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT 0x9e893c21U
#define MENU_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT 0x91a47d95U
#define MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT 0x9c9c8e3eU
#define MENU_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT 0x1a817f5bU
#define MENU_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT 0x89849204U
#define MENU_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT 0xe1dcea36U
#define MENU_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT 0xf9bc2a42U

View File

@ -66,7 +66,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_EGL -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 += -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_EGL -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 -DHAVE_NETWORK_GAMEPAD
LOCAL_CFLAGS += -DHAVE_7ZIP
LOCAL_CFLAGS += -DHAVE_CHEEVOS