From a3033c2f668db78a99107356cd14e2fe7e2db653 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Dec 2015 18:12:40 +0100
Subject: [PATCH] Buildfixes

---
 frontend/drivers/platform_ctr.c    | 2 +-
 frontend/drivers/platform_darwin.m | 2 +-
 frontend/drivers/platform_win32.c  | 7 ++++++-
 frontend/drivers/platform_xdk.cpp  | 2 +-
 gfx/video_driver.c                 | 2 --
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 056c9fcfc6..0832cea4a7 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -36,7 +36,7 @@
 #ifdef IS_SALAMANDER
 #include "../../file_ext.h"
 #else
-#include "../../menu/menu.h"
+#include "../../menu/menu_driver.h"
 #endif
 
 const char* elf_path_cst = "sdmc:/retroarch/test.3dsx";
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index 62ac2a93f9..7326892fd6 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -50,7 +50,7 @@
 #include "../../verbosity.h"
 
 #ifdef HAVE_MENU
-#include "../../menu/menu.h"
+#include "../../menu/menu_driver.h"
 #endif
 
 #if 1
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index aecfe3118e..d217b393a0 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -26,7 +26,10 @@
 #include "../frontend_driver.h"
 #include "../../general.h"
 #include "../../verbosity.h"
-#include "../../menu/menu.h"
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
 
 /* We only load this library once, so we let it be 
  * unloaded at application shutdown, since unloading 
@@ -209,6 +212,7 @@ enum frontend_architecture frontend_win32_get_architecture(void)
 
 static int frontend_win32_parse_drive_list(void *data)
 {
+#ifdef HAVE_MENU
    size_t i = 0;
    unsigned drives = GetLogicalDrives();
    char    drive[] = " :\\";
@@ -221,6 +225,7 @@ static int frontend_win32_parse_drive_list(void *data)
          menu_entries_push(list,
                drive, "", MENU_FILE_DIRECTORY, 0, 0);
    }
+#endif
 
    return 0;
 }
diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp
index e74dabaca0..5f1a97cb9d 100644
--- a/frontend/drivers/platform_xdk.cpp
+++ b/frontend/drivers/platform_xdk.cpp
@@ -33,7 +33,7 @@
 #ifndef IS_SALAMANDER
 #include "../../retroarch.h"
 #ifdef HAVE_MENU
-#include "../../menu/menu.h"
+#include "../../menu/menu_driver.h"
 #endif
 #endif
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 9db8fb4c26..9ef1a6ca67 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -536,8 +536,6 @@ static bool uninit_video_input(void)
    event_command(EVENT_CMD_SHADER_DIR_DEINIT);
    video_monitor_compute_fps_statistics();
 
-
-
    return true;
 }