From 9fa871ccf9a7975366384831fb2deb4af09ffe29 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 28 May 2017 18:33:44 +0200
Subject: [PATCH] Buildfixes for consoles

---
 dynamic.c               |  5 -----
 menu/cbs/menu_cbs_ok.c  |  3 +++
 menu/menu_displaylist.c | 35 ++++++++++++++---------------------
 tasks/task_content.c    |  2 ++
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/dynamic.c b/dynamic.c
index 635d5e2f55..5310a19e0c 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -296,11 +296,6 @@ static dylib_t libretro_get_system_info_lib(const char *path,
 
    return lib;
 }
-#else
-static void libretro_get_system_info_static(struct retro_system_info *info,
-      bool *load_no_content)
-{
-}
 #endif
 
 
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 7e554471cb..b76738df97 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2281,6 +2281,8 @@ static int action_ok_start_video_processor_core(const char *path,
 
    return 0;
 }
+
+#ifdef HAVE_FFMPEG
 static int action_ok_file_load_ffmpeg(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
@@ -2310,6 +2312,7 @@ static int action_ok_file_load_ffmpeg(const char *path,
 
    return 0;
 }
+#endif
 
 static int action_ok_audio_run(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3fef229255..a98e9efec3 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -84,13 +84,13 @@ static char new_lbl_entry[4096]         = {0};
 static char new_entry[4096]             = {0};
 static enum msg_hash_enums new_type     = MSG_UNKNOWN;
 
+#ifdef HAVE_NETWORKING
 /* HACK - we have to find some way to pass state inbetween
  * function pointer callback functions that don't necessarily
  * call each other. */
 static char *core_buf                   = NULL;
 static size_t core_len                  = 0;
 
-#ifdef HAVE_NETWORKING
 void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
 {
    char subdir_path[PATH_MAX_LENGTH];
@@ -4111,6 +4111,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
    switch (type)
    {
+      case DISPLAYLIST_ACHIEVEMENT_LIST:
+         /* TODO/FIXME */
+         break;
+      case DISPLAYLIST_ACHIEVEMENT_LIST_HARDCORE:
+         /* TODO/FIXME */
+         break;
       case DISPLAYLIST_MUSIC_LIST:
          {
             char combined_path[PATH_MAX_LENGTH];
@@ -4463,6 +4469,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             if (cores_names_size == 0)
             {
+               rarch_system_info_t *system_info = runloop_get_system_info();
+               struct retro_system_info *system = &system_info->info;
+               const char *core_name            = system ? system->library_name : NULL;
+
                if (!path_is_empty(RARCH_PATH_CORE))
                {
 
@@ -4474,32 +4484,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                         0,
                         0);
 
-                  {
-                     const char *core_name            = NULL;
-                     rarch_system_info_t *system_info = runloop_get_system_info();
-                     struct retro_system_info *system = &system_info->info;
-
-                     if (system)
-                        core_name = system->library_name;
-
-                     if (!string_is_empty(core_name))
-                        menu_entries_set_alt_at_offset(info->list, 0,
-                              core_name);
-                  }
+                  if (!string_is_empty(core_name))
+                     menu_entries_set_alt_at_offset(info->list, 0,
+                           core_name);
                }
                else
                {
 #ifndef HAVE_DYNAMIC
-                  const char *core_name            = NULL;
-                  struct retro_system_info *system = NULL;
-
-                  menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
-                        &system);
-
                   if (system)
                   {
-                     core_name = system->library_name;
-
                      menu_entries_append_enum(info->list,
                            core_name,
                            core_name,
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 7cfb71611d..e9823d3d6b 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1391,7 +1391,9 @@ bool task_push_load_content_with_new_core_from_menu(
    if (type != CORE_TYPE_DUMMY)
       menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
 
+#ifdef HAVE_DYNAMIC
 end:
+#endif
    if (content_ctx.name_ips)
       free(content_ctx.name_ips);
    if (content_ctx.name_bps)