From bd88b9d1d22bf39125fbbade799e0bc5b1fea8eb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 24 Jul 2016 11:32:45 +0200
Subject: [PATCH] (Wii) Fix warnings / unused variables

---
 config.def.h                   | 6 ++++--
 frontend/drivers/platform_gx.c | 3 +--
 list_special.c                 | 2 ++
 menu/menu_displaylist.c        | 4 ++++
 menu/menu_setting.c            | 4 ++++
 tasks/task_content.c           | 1 -
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config.def.h b/config.def.h
index c826f34de4..ae3e3aa7c6 100644
--- a/config.def.h
+++ b/config.def.h
@@ -516,17 +516,17 @@ static const bool overlay_hide_in_menu = true;
 
 static bool default_block_config_read = true;
 
+#ifdef HAVE_XMB
 static unsigned xmb_scale_factor = 100;
 static unsigned xmb_alpha_factor = 75;
-
 static unsigned xmb_icon_theme   = XMB_ICON_THEME_MONOCHROME;
 static unsigned xmb_theme        = XMB_THEME_ELECTRIC_BLUE;
-
 #ifdef HAVE_LAKKA
 static bool xmb_shadows_enable   = false;
 #else
 static bool xmb_shadows_enable   = true;
 #endif
+#endif
 
 static float menu_wallpaper_opacity = 0.300;
 
@@ -534,7 +534,9 @@ static float menu_footer_opacity = 1.000;
 
 static float menu_header_opacity = 1.000;
 
+#ifdef HAVE_MATERIALUI
 static unsigned menu_background_gradient = 4;
+#endif
 
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
 #if defined(HAVE_OPENGLES2) || defined(OSX_PPC)
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 2f68b6f30e..dcd4d2aeee 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -404,13 +404,12 @@ static void frontend_gx_exitspawn(char *s, size_t len)
 static void frontend_gx_process_args(int *argc, char *argv[])
 {
 #ifndef IS_SALAMANDER
-   char path[PATH_MAX_LENGTH] = {0};
-
    /* A big hack: sometimes Salamander doesn't save the new core
     * it loads on first boot, so we make sure
     * active core path is set here. */
    if (config_active_core_path_is_empty() && *argc >= 1 && strrchr(argv[0], '/'))
    {
+      char path[PATH_MAX_LENGTH] = {0};
       strlcpy(path, strrchr(argv[0], '/') + 1, sizeof(path));
       if (path_file_exists(path))
          runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, path);
diff --git a/list_special.c b/list_special.c
index cab7f5bd74..0f43dbe451 100644
--- a/list_special.c
+++ b/list_special.c
@@ -87,6 +87,8 @@ struct string_list *dir_list_new_special(const char *input_dir,
             if (!str_list)
                return NULL;
 
+            (void)attr;
+
             dir  = input_dir;
 #ifdef HAVE_CG
             string_list_append(str_list, "cg", attr);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2a60ab1f3e..628e955ac8 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -5558,6 +5558,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             union string_list_elem_attr attr = {0};
             struct string_list *str_list     = string_list_new();
 
+            (void)attr;
+
             menu_displaylist_reset_filebrowser();
             info->type_default = FILE_TYPE_SHADER_PRESET;
 
@@ -5582,6 +5584,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             menu_displaylist_reset_filebrowser();
             info->type_default = FILE_TYPE_SHADER;
 
+            (void)attr;
+
 #ifdef HAVE_CG
             string_list_append(str_list, "cg", attr);
 #endif
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index ed57078206..210c7b866d 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6854,6 +6854,7 @@ static bool setting_append_list(
             menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE);
          }
 
+#ifdef HAVE_XMB
          /* only XMB uses these values, don't show them on other drivers */
          if (string_is_equal(settings->menu.driver, "xmb"))
          {
@@ -6959,7 +6960,9 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0, XMB_THEME_LAST-1, 1, true, true);
             menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME);
          }
+#endif
 
+#ifdef HAVE_MATERIALUI
          /* only MaterialUI uses these values, don't show them on other drivers */
          if (string_is_equal(settings->menu.driver, "glui"))
          {
@@ -7007,6 +7010,7 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true);
             menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY);
          }
+#endif
 
          CONFIG_BOOL(
                list, list_info,
diff --git a/tasks/task_content.c b/tasks/task_content.c
index c572063a54..b5879b4f08 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1544,7 +1544,6 @@ static void menu_content_environment_get(int *argc, char *argv[],
    char *fullpath                    = NULL;
    struct rarch_main_wrap *wrap_args = (struct rarch_main_wrap*)params_data;
    global_t *global                  = global_get_ptr();
-   settings_t *settings              = config_get_ptr();
     
    if (!wrap_args)
       return;