From af2a33a8cb6493dd8bee781c54532a2468f26cd4 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 10 May 2016 01:25:47 +0200
Subject: [PATCH] Move core_option_manager to managers/

---
 Makefile.common                                  | 2 +-
 griffin/griffin.c                                | 2 +-
 core_options.c => managers/core_option_manager.c | 4 ++--
 core_options.h => managers/core_option_manager.h | 4 ++--
 menu/cbs/menu_cbs_get_value.c                    | 2 +-
 menu/cbs/menu_cbs_start.c                        | 2 +-
 menu/menu_displaylist.c                          | 2 +-
 runloop.c                                        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename core_options.c => managers/core_option_manager.c (99%)
 rename core_options.h => managers/core_option_manager.h (98%)

diff --git a/Makefile.common b/Makefile.common
index 955a636de1..9d184e89f8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -168,7 +168,7 @@ OBJ += frontend/frontend.o \
        input/input_overlay.o \
        patch.o \
        libretro-common/queues/fifo_queue.o \
-       core_options.o \
+       managers/core_option_manager.o \
        libretro-common/compat/compat_fnmatch.o \
        libretro-common/compat/compat_posix_string.o \
        managers/cheat_manager.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 62be59e8da..8c0d1ab72f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -101,7 +101,7 @@ CONFIG FILE
 
 #include "../libretro-common/file/config_file.c"
 #include "../config_file_userdata.c"
-#include "../core_options.c"
+#include "../managers/core_option_manager.c"
 
 /*============================================================
 ACHIEVEMENTS
diff --git a/core_options.c b/managers/core_option_manager.c
similarity index 99%
rename from core_options.c
rename to managers/core_option_manager.c
index 7e391bfb10..466f10352d 100644
--- a/core_options.c
+++ b/managers/core_option_manager.c
@@ -24,9 +24,9 @@
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
 
-#include "libretro.h"
+#include "../libretro.h"
 
-#include "core_options.h"
+#include "core_option_manager.h"
 
 struct core_option
 {
diff --git a/core_options.h b/managers/core_option_manager.h
similarity index 98%
rename from core_options.h
rename to managers/core_option_manager.h
index ff972434ba..152e8d19c7 100644
--- a/core_options.h
+++ b/managers/core_option_manager.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CORE_OPTIONS_H__
-#define CORE_OPTIONS_H__
+#ifndef CORE_OPTION_MANAGER_H__
+#define CORE_OPTION_MANAGER_H__
 
 #include <stddef.h>
 
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index d9381dcc6c..6c49bcfeec 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -27,7 +27,7 @@
 #include "../../input/input_config.h"
 
 #include "../../core_info.h"
-#include "../../core_options.h"
+#include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../performance.h"
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index d4a752dc1a..ed07712099 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -25,7 +25,7 @@
 #include "../menu_hash.h"
 
 #include "../../core_info.h"
-#include "../../core_options.h"
+#include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../retroarch.h"
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 6ad28b2c35..babe720ea0 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -32,6 +32,7 @@
 
 #include "../defaults.h"
 #include "../managers/cheat_manager.h"
+#include "../managers/core_option_manager.h"
 #include "../general.h"
 #include "../retroarch.h"
 #include "../system.h"
@@ -45,7 +46,6 @@
 #include "../list_special.h"
 #include "../performance.h"
 #include "../core_info.h"
-#include "../core_options.h"
 
 #ifdef HAVE_CHEEVOS
 #include "../cheevos.h"
diff --git a/runloop.c b/runloop.c
index a5d0c87ac8..44a6ba753c 100644
--- a/runloop.c
+++ b/runloop.c
@@ -37,12 +37,12 @@
 #endif
 #include "autosave.h"
 #include "core_info.h"
-#include "core_options.h"
 #include "configuration.h"
 #include "performance.h"
 #include "movie.h"
 #include "retroarch.h"
 #include "runloop.h"
+#include "managers/core_option_manager.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
 #include "system.h"