mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-04 16:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2596 from ctult/master

Browse Source 
bad griffin, breaking vita
This commit is contained in:
Twinaphex 2015-12-25 08:15:54 +01:00
commit 2e6327f5ca
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -881,7 +881,7 @@ ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_NETPLAY), 1) ifeq ($(HAVE_NETPLAY), 1)
DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD -DHAVE_NETWORK_GAMEPAD
OBJ += netplay/netplay.o netplay/netplay_net.o netplay/netplay_spectate.o netplay/netplay_common.o OBJ += netplay/netplay_net.o netplay/netplay_spectate.o netplay/netplay_common.o netplay/netplay.o
endif endif
# Retro Achievements (also depends on threads) # Retro Achievements (also depends on threads)

2
griffin/griffin.c
View File

@ -744,10 +744,10 @@ THREAD
NETPLAY NETPLAY
============================================================ */ ============================================================ */
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
#include "../netplay/netplay.c"
#include "../netplay/netplay_net.c" #include "../netplay/netplay_net.c"
#include "../netplay/netplay_spectate.c" #include "../netplay/netplay_spectate.c"
#include "../netplay/netplay_common.c" #include "../netplay/netplay_common.c"
#include "../netplay/netplay.c"
#include "../libretro-common/net/net_compat.c" #include "../libretro-common/net/net_compat.c"
#include "../libretro-common/net/net_http.c" #include "../libretro-common/net/net_http.c"
#include "../tasks/task_http.c" #include "../tasks/task_http.c"

2
menu/menu_driver.c
View File

@ -541,6 +541,7 @@ static void menu_free(menu_handle_t *menu)
free(menu); free(menu);
} }
#ifdef HAVE_ZLIB
static void bundle_decompressed(void *task_data, void *user_data, const char *err) static void bundle_decompressed(void *task_data, void *user_data, const char *err)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -562,6 +563,7 @@ static void bundle_decompressed(void *task_data, void *user_data, const char *er
settings->bundle_assets_extract_last_version = settings->bundle_assets_extract_version_current; settings->bundle_assets_extract_last_version = settings->bundle_assets_extract_version_current;
settings->bundle_finished = true; settings->bundle_finished = true;
} }
#endif
/** /**
* menu_init: * menu_init:

7
netplay/netplay.c
View File

@ -1140,7 +1140,14 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
return false; return false;
} }
/* /!\ WARNING: POTENTIAL PITFALL
netplay.c does something naughty and undefines
sockaddr_storage and addrinfo. This is disastrous
for griffin builds.
TODO: put this somewhere safer.
*/
#ifdef HAVE_SOCKET_LEGACY #ifdef HAVE_SOCKET_LEGACY
#undef sockaddr_storage #undef sockaddr_storage