bad griffin, breaking vita

This commit is contained in:
ctult 2015-12-25 00:02:52 -07:00
parent 209ca07383
commit c1792fe84e
3 changed files with 4 additions and 2 deletions

View File

@ -881,7 +881,7 @@ ifeq ($(HAVE_NETWORKING), 1)
ifeq ($(HAVE_NETPLAY), 1)
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
# Retro Achievements (also depends on threads)

View File

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

View File

@ -541,6 +541,7 @@ static void menu_free(menu_handle_t *menu)
free(menu);
}
#ifdef HAVE_ZLIB
static void bundle_decompressed(void *task_data, void *user_data, const char *err)
{
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_finished = true;
}
#endif
/**
* menu_init: