From 762151758d0704394699fe3462ad0505e2cf4070 Mon Sep 17 00:00:00 2001
From: orbea <orbea@fredslev.dk>
Date: Mon, 4 Feb 2019 08:20:34 -0800
Subject: [PATCH] Fix --disable-menu (Again).

---
 command.c                      | 1 +
 config.def.h                   | 7 +++----
 configuration.c                | 3 +++
 driver.c                       | 1 +
 managers/cheat_manager.c       | 1 +
 managers/core_option_manager.h | 2 ++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/command.c b/command.c
index fb617da1a2..4958167f00 100644
--- a/command.c
+++ b/command.c
@@ -91,6 +91,7 @@
 #include "ui/ui_companion_driver.h"
 #include "tasks/task_content.h"
 #include "tasks/tasks_internal.h"
+#include "gfx/video_driver.h"
 #include "list_special.h"
 
 #include "core.h"
diff --git a/config.def.h b/config.def.h
index 1515ab3fa9..ce2f85c97b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -372,8 +372,9 @@ static unsigned menu_shader_pipeline = 1;
 static unsigned menu_shader_pipeline = 2;
 #endif
 
-static bool show_advanced_settings            = false;
-static unsigned rgui_color_theme = RGUI_THEME_CLASSIC_GREEN;
+static bool show_advanced_settings        = false;
+static unsigned rgui_color_theme          = RGUI_THEME_CLASSIC_GREEN;
+static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
 
 #else
 static bool default_block_config_read = false;
@@ -754,8 +755,6 @@ static const unsigned menu_timedate_style = 5;
 
 static const bool xmb_vertical_thumbnails = false;
 
-static unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT;
-
 #ifdef IOS
 static const bool ui_companion_start_on_boot = false;
 #else
diff --git a/configuration.c b/configuration.c
index ac3d2d7502..0cc7860cd2 100644
--- a/configuration.c
+++ b/configuration.c
@@ -34,6 +34,7 @@
 
 #include "file_path_special.h"
 #include "audio/audio_driver.h"
+#include "gfx/video_driver.h"
 #include "input/input_driver.h"
 #include "configuration.h"
 #include "content.h"
@@ -1661,8 +1662,10 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false);
    SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
    SETTING_UINT("menu_timedate_style", &settings->uints.menu_timedate_style, true, menu_timedate_style, false);
+#ifdef HAVE_RGUI
    SETTING_UINT("rgui_menu_color_theme",        &settings->uints.menu_rgui_color_theme, true, rgui_color_theme, false);
    SETTING_UINT("rgui_thumbnail_downscaler",    &settings->uints.menu_rgui_thumbnail_downscaler, true, rgui_thumbnail_downscaler, false);
+#endif
 #ifdef HAVE_LIBNX
    SETTING_UINT("split_joycon_p1", &settings->uints.input_split_joycon[0], true, 0, false);
    SETTING_UINT("split_joycon_p2", &settings->uints.input_split_joycon[1], true, 0, false);
diff --git a/driver.c b/driver.c
index 5881d1a63f..f788e59882 100644
--- a/driver.c
+++ b/driver.c
@@ -32,6 +32,7 @@
 
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
+#include "gfx/video_driver.h"
 #include "record/record_driver.h"
 #include "location/location_driver.h"
 #include "wifi/wifi_driver.h"
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index a3277a4be5..cfd69f3619 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
+#include <math.h>
 
 #include <file/config_file.h>
 #include <file/file_path.h>
diff --git a/managers/core_option_manager.h b/managers/core_option_manager.h
index a7e2744d39..60dbe0fa4b 100644
--- a/managers/core_option_manager.h
+++ b/managers/core_option_manager.h
@@ -23,6 +23,8 @@
 #include <retro_common_api.h>
 #include <lists/string_list.h>
 
+#include "../gfx/video_driver.h"
+
 RETRO_BEGIN_DECLS
 
 struct core_option