Move core_option_manager to managers/

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 \

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

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
 {

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>
 

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"

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"

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"

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"