mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-11 15:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5725 from fr500/master

Browse Source 
console build fixes
This commit is contained in:
Twinaphex 2017-11-19 21:50:38 +01:00 committed by GitHub
commit 118f1986ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.wiiu
View File

@ -73,6 +73,7 @@ else
BLACKLIST := BLACKLIST :=
BLACKLIST += input/input_overlay.o BLACKLIST += input/input_overlay.o
BLACKLIST += tasks/task_overlay.o BLACKLIST += tasks/task_overlay.o
BLACKLIST += network/netplay/netplay_discovery.o
BLACKLIST += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o BLACKLIST += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
OBJ := $(filter-out $(BLACKLIST),$(OBJ)) OBJ := $(filter-out $(BLACKLIST),$(OBJ))

7
menu/cbs/menu_cbs_ok.c
View File

@ -3737,11 +3737,14 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha
char s[PATH_MAX_LENGTH]; char s[PATH_MAX_LENGTH];
unsigned i = 0; unsigned i = 0;
unsigned j = 0; unsigned j = 0;
lan_room_count = 0;
file_list_t *file_list = menu_entries_get_selection_buf_ptr(0); file_list_t *file_list = menu_entries_get_selection_buf_ptr(0);
#ifndef RARCH_CONSOLE
netplay_discovery_driver_ctl(RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES, &lan_hosts); netplay_discovery_driver_ctl(RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES, &lan_hosts);
if (lan_hosts) if (lan_hosts)
lan_room_count = (int)lan_hosts->size; lan_room_count = (int)lan_hosts->size;
#endif
netplay_rooms_parse(data->data); netplay_rooms_parse(data->data);
@ -3866,7 +3869,9 @@ static int action_ok_push_netplay_refresh_rooms(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
char url [2048] = "http://newlobby.libretro.com/list/"; char url [2048] = "http://newlobby.libretro.com/list/";
#ifndef RARCH_CONSOLE
task_push_netplay_lan_scan(netplay_lan_scan_callback); task_push_netplay_lan_scan(netplay_lan_scan_callback);
#endif
task_push_http_transfer(url, true, NULL, netplay_refresh_rooms_cb, NULL); task_push_http_transfer(url, true, NULL, netplay_refresh_rooms_cb, NULL);
return 0; return 0;
} }