From 9c96b3ada2edbe879ecdb93c3cb26cacf4ed7aa3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 25 Jul 2014 20:56:31 +0200
Subject: [PATCH] Make history.c no longer dependent on menu

---
 Makefile                                  |  4 +++-
 Makefile.emscripten                       |  4 +++-
 Makefile.win                              |  4 +++-
 general.h                                 |  2 +-
 griffin/griffin.c                         |  7 ++++++-
 frontend/menu/history.c => history.c      | 10 +++++-----
 frontend/menu/history.h => history.h      |  0
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj |  2 +-
 8 files changed, 22 insertions(+), 11 deletions(-)
 rename frontend/menu/history.c => history.c (97%)
 rename frontend/menu/history.h => history.h (100%)

diff --git a/Makefile b/Makefile
index 917b6200ab..36126cb65e 100644
--- a/Makefile
+++ b/Makefile
@@ -111,8 +111,10 @@ ifeq ($(HAVE_LAKKA), 1)
 endif
 endif
 
+OBJ += history.o
+
 ifeq ($(HAVE_MENU_COMMON), 1)
-   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o
+   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o
 endif
 
 ifeq ($(HAVE_THREADS), 1)
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 2cdff23034..715a171280 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -79,8 +79,10 @@ ifeq ($(HAVE_RGUI), 1)
 	HAVE_MENU_COMMON = 1
 endif
 
+OBJ += history.o
+
 ifeq ($(HAVE_MENU_COMMON), 1)
-   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o
+   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o 
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/Makefile.win b/Makefile.win
index 872d3171bc..7da28cb25c 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -125,8 +125,10 @@ ifeq ($(HAVE_LAKKA), 1)
 endif
 endif
 
+OBJ += history.o
+
 ifeq ($(HAVE_MENU_COMMON), 1)
-   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o frontend/menu/history.o
+   OBJ += frontend/menu/backend/menu_common_backend.o frontend/menu/menu_input_line_cb.o frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/file_list.o 
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/general.h b/general.h
index fca46f3e62..7cc42a050a 100644
--- a/general.h
+++ b/general.h
@@ -35,7 +35,7 @@
 #include "miscellaneous.h"
 #include "gfx/filter.h"
 
-#include "frontend/menu/history.h"
+#include "history.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5a5ea2b369..42e5b0e766 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -596,6 +596,12 @@ SCREENSHOTS
 #include "../screenshot.c"
 #endif
 
+
+/*============================================================
+HISTORY
+============================================================ */
+#include "../history.c"
+
 /*============================================================
 MENU
 ============================================================ */
@@ -603,7 +609,6 @@ MENU
 #include "../frontend/menu/menu_input_line_cb.c"
 #include "../frontend/menu/menu_common.c"
 #include "../frontend/menu/menu_navigation.c"
-#include "../frontend/menu/history.c"
 #include "../frontend/menu/file_list.c"
 
 #ifdef HAVE_MENU
diff --git a/frontend/menu/history.c b/history.c
similarity index 97%
rename from frontend/menu/history.c
rename to history.c
index 880eee2549..57b2fc4b63 100644
--- a/frontend/menu/history.c
+++ b/history.c
@@ -16,11 +16,11 @@
  */
 
 #include "history.h"
-#include "../../msvc/msvc_compat.h"
-#include "../../compat/posix_string.h"
-#include "../../boolean.h"
-#include "../../general.h"
-#include "../../file.h"
+#include "msvc/msvc_compat.h"
+#include "compat/posix_string.h"
+#include "boolean.h"
+#include "general.h"
+#include "file.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/frontend/menu/history.h b/history.h
similarity index 100%
rename from frontend/menu/history.h
rename to history.h
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index db580aa4f0..5fb4c14964 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -217,7 +217,7 @@
     <ClCompile Include="..\..\deps\rzlib\unzip.c" />
     <ClCompile Include="..\..\deps\rzlib\zutil.c" />
     <ClCompile Include="..\..\file_extract.c" />
-    <ClCompile Include="..\..\frontend\menu\history.c" />
+    <ClCompile Include="..\..\history.c" />
     <ClCompile Include="..\..\frontend\menu\file_list.c" />
     <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c" />
     <ClCompile Include="..\..\frontend\menu\disp\rgui.c" />