From bca57d827b4fc33f6fa7f3972d313f091bb16599 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 26 Jul 2014 18:31:34 +0200
Subject: [PATCH] Move file_list.c outside of frontend/menu

---
 Makefile                                  | 3 ++-
 Makefile.emscripten                       | 3 ++-
 driver_menu.h                             | 2 +-
 frontend/menu/file_list.c => file_list.c  | 6 +++---
 frontend/menu/file_list.h => file_list.h  | 2 +-
 frontend/menu/disp/lakka.c                | 1 -
 frontend/menu/disp/rgui.c                 | 1 -
 frontend/menu/disp/rmenu.c                | 1 -
 griffin/griffin.c                         | 2 +-
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj | 2 +-
 10 files changed, 11 insertions(+), 12 deletions(-)
 rename frontend/menu/file_list.c => file_list.c (97%)
 rename frontend/menu/file_list.h => file_list.h (98%)

diff --git a/Makefile b/Makefile
index 36126cb65e..080128a042 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ OBJ = frontend/frontend.o \
 		frontend/platform/platform_null.o \
 		retroarch.o \
 		file.o \
+		file_list.o \
 		file_path.o \
 		hash.o \
 		driver.o \
@@ -114,7 +115,7 @@ 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
+   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 
 endif
 
 ifeq ($(HAVE_THREADS), 1)
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 715a171280..99cb5b0856 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -7,6 +7,7 @@ OBJ = frontend/platform/platform_emscripten.o \
 		frontend/menu/menu_input_line_cb.o \
 		retroarch.o \
 		file.o \
+		file_list.o \
 		file_path.o \
 		driver.o \
 		conf/config_file.o \
@@ -82,7 +83,7 @@ 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 
+   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
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/driver_menu.h b/driver_menu.h
index 2a8b7ad90d..09db5fcc2a 100644
--- a/driver_menu.h
+++ b/driver_menu.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "boolean.h"
-#include "frontend/menu/file_list.h"
+#include "file_list.h"
 #include "frontend/info/core_info.h"
 
 #ifdef __cplusplus
diff --git a/frontend/menu/file_list.c b/file_list.c
similarity index 97%
rename from frontend/menu/file_list.c
rename to file_list.c
index c7b41e7417..c7e89c86d7 100644
--- a/frontend/menu/file_list.c
+++ b/file_list.c
@@ -17,9 +17,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "file_list.h"
-#include "../../driver.h"
-#include "../../compat/strcasestr.h"
-#include "../../msvc/msvc_compat.h"
+#include "driver.h"
+#include "compat/strcasestr.h"
+#include "msvc/msvc_compat.h"
 
 struct item_file
 {
diff --git a/frontend/menu/file_list.h b/file_list.h
similarity index 98%
rename from frontend/menu/file_list.h
rename to file_list.h
index 5a7205eb3d..26122461f3 100644
--- a/frontend/menu/file_list.h
+++ b/file_list.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "../../boolean.h"
+#include "boolean.h"
 
 struct item_file;
 typedef struct file_list
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 897f9d6754..05cbe09833 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -24,7 +24,6 @@
 
 #include "../backend/menu_common_backend.h"
 #include "../menu_common.h"
-#include "../file_list.h"
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../gfx/gl_common.h"
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 01bceac6de..f753825f4a 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -23,7 +23,6 @@
 
 #include "../backend/menu_common_backend.h"
 #include "../menu_common.h"
-#include "../file_list.h"
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../config.def.h"
diff --git a/frontend/menu/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index a46298045e..5cf1706d84 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -23,7 +23,6 @@
 
 #include "../backend/menu_common_backend.h"
 #include "../menu_common.h"
-#include "../file_list.h"
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../config.def.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 42e5b0e766..dc4a8c2473 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -504,6 +504,7 @@ FILE
 ============================================================ */
 #include "../file.c"
 #include "../file_path.c"
+#include "../file_list.c"
 
 /*============================================================
 MESSAGE
@@ -609,7 +610,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/file_list.c"
 
 #ifdef HAVE_MENU
 #include "../frontend/menu/backend/menu_common_backend.c"
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 5fb4c14964..bf5a243ecc 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -218,7 +218,7 @@
     <ClCompile Include="..\..\deps\rzlib\zutil.c" />
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\history.c" />
-    <ClCompile Include="..\..\frontend\menu\file_list.c" />
+    <ClCompile Include="..\..\file_list.c" />
     <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c" />
     <ClCompile Include="..\..\frontend\menu\disp\rgui.c" />
     <ClCompile Include="..\..\frontend\menu\menu_common.c" />