From c1792fe84ebec5f607166369dab6b0eb57de0db6 Mon Sep 17 00:00:00 2001 From: ctult Date: Fri, 25 Dec 2015 00:02:52 -0700 Subject: [PATCH] bad griffin, breaking vita --- Makefile.common | 2 +- griffin/griffin.c | 2 +- menu/menu_driver.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 00b8690f56..45691447ae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -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) diff --git a/griffin/griffin.c b/griffin/griffin.c index cc614186ee..320d275e35 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -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" diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 13c5b5df3b..cb24892472 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -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: