From eb10008bf7c64e8f349c5f7f85fd6730d821c46d Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Wed, 15 May 2019 10:02:55 +0100 Subject: [PATCH] Add missing HAVE_MENU ifdefs (DISABLE_MENU=1 buildfix) --- Makefile.common | 7 +++++-- griffin/griffin.c | 2 +- tasks/tasks_internal.h | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1cd69e2283..b5d7ea0c0e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1682,8 +1682,11 @@ ifeq ($(HAVE_NETWORKING), 1) tasks/task_netplay_lan_scan.o \ tasks/task_netplay_nat_traversal.o \ tasks/task_wifi.o \ - tasks/task_netplay_find_content.o \ - tasks/task_pl_thumbnail_download.o + tasks/task_netplay_find_content.o + + ifeq ($(HAVE_MENU_COMMON), 1) + OBJ += tasks/task_pl_thumbnail_download.o + endif ifeq ($(HAVE_SSL), 1) OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl.o diff --git a/griffin/griffin.c b/griffin/griffin.c index c6d55d2a37..36b46f7ec6 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1201,7 +1201,7 @@ DATA RUNLOOP #include "../tasks/task_database.c" #include "../tasks/task_database_cue.c" #endif -#ifdef HAVE_NETWORKING +#if defined(HAVE_NETWORKING) && defined(HAVE_MENU) #include "../tasks/task_pl_thumbnail_download.c" #endif diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h index ca17bd48a9..2056adec21 100644 --- a/tasks/tasks_internal.h +++ b/tasks/tasks_internal.h @@ -56,7 +56,9 @@ bool task_push_netplay_lan_scan_rooms(retro_task_callback_t cb); bool task_push_netplay_nat_traversal(void *nat_traversal_state, uint16_t port); +#ifdef HAVE_MENU bool task_push_pl_thumbnail_download(const char *system, const char *playlist_path); +#endif #endif