Create managers/ dir - move cheats.c and state_manager.c to it

Makefile.common

@@ -157,7 +157,7 @@ OBJ += frontend/frontend.o \
        dynamic.o \
        cores/dynamic_dummy.o \
        libretro-common/queues/message_queue.o \
-       state_manager.o \
+       managers/state_manager.o \
        gfx/drivers_font_renderer/bitmapfont.o \
        input/input_autodetect.o \
        input/input_joypad_driver.o \
@@ -171,7 +171,7 @@ OBJ += frontend/frontend.o \
        core_options.o \
        libretro-common/compat/compat_fnmatch.o \
        libretro-common/compat/compat_posix_string.o \
-       cheats.o \
+       managers/cheat_manager.o \
        core_info.o \
        libretro-common/file/config_file.o \
        config_file_userdata.o \

command_event.c

@@ -29,7 +29,6 @@
 #include "autosave.h"
 #include "core_info.h"
 #include "core_type.h"
-#include "cheats.h"
 #include "performance.h"
 #include "dynamic.h"
 #include "content.h"
@@ -37,7 +36,8 @@
 #include "screenshot.h"
 #include "msg_hash.h"
 #include "retroarch.h"
-#include "state_manager.h"
+#include "managers/cheat_manager.h"
+#include "managers/state_manager.h"
 #include "system.h"
 #include "ui/ui_companion_driver.h"
 #include "list_special.h"

core_impl.c

@@ -30,7 +30,7 @@
 #include "core.h"
 #include "general.h"
 #include "msg_hash.h"
-#include "state_manager.h"
+#include "managers/state_manager.h"
 #include "system.h"
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"

gfx/drivers_shader/shader_gl_cg.c

@@ -40,7 +40,7 @@
 #include "../video_shader_parse.h"
 #include "../../core.h"
 #include "../../dynamic.h"
-#include "../../state_manager.h"
+#include "../../managers/state_manager.h"
 #include "../video_state_tracker.h"
 
 #include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h"

gfx/drivers_shader/shader_glsl.c

@@ -27,7 +27,7 @@
 #include "shader_glsl.h"
 #include "../video_state_tracker.h"
 #include "../../dynamic.h"
-#include "../../state_manager.h"
+#include "../../managers/state_manager.h"
 #include "../../core.h"
 
 #ifdef HAVE_CONFIG_H

gfx/drivers_shader/shader_hlsl.c

@@ -20,7 +20,7 @@
 
 #include "../video_shader_parse.h"
 #include "../d3d/d3d.h"
-#include "../../state_manager.h"
+#include "../../managers/state_manager.h"
 
 #include "../drivers/d3d_shaders/opaque.hlsl.d3d9.h"
 

griffin/griffin.c

@@ -120,7 +120,7 @@ ACHIEVEMENTS
 /*============================================================
 CHEATS
 ============================================================ */
-#include "../cheats.c"
+#include "../managers/cheat_manager.c"
 #include "../libretro-common/hash/rhash.c"
 
 /*============================================================
@@ -670,7 +670,7 @@ CONFIGURATION
 /*============================================================
 STATE MANAGER
 ============================================================ */
-#include "../state_manager.c"
+#include "../managers/state_manager.c"
 
 /*============================================================
 FRONTEND

managers/cheat_manager.c

@@ -23,18 +23,18 @@
 #include <compat/strl.h>
 #include <compat/posix_string.h>
 
-#include "cheats.h"
-#include "runloop.h"
-#include "dynamic.h"
-#include "core.h"
-#include "verbosity.h"
+#include "cheat_manager.h"
+#include "../runloop.h"
+#include "../dynamic.h"
+#include "../core.h"
+#include "../verbosity.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../config.h"
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "cheevos.h"
+#include "../cheevos.h"
 #endif
 
 struct item_cheat

managers/state_manager.c

@@ -19,17 +19,21 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if __SSE2__
+#include <emmintrin.h>
+#endif
+
 #include <retro_inline.h>
 
 #include "state_manager.h"
-#include "configuration.h"
-#include "msg_hash.h"
-#include "movie.h"
-#include "core.h"
-#include "runloop.h"
-#include "performance.h"
-#include "verbosity.h"
-#include "audio/audio_driver.h"
+#include "../configuration.h"
+#include "../msg_hash.h"
+#include "../movie.h"
+#include "../core.h"
+#include "../runloop.h"
+#include "../performance.h"
+#include "../verbosity.h"
+#include "../audio/audio_driver.h"
 
 /* This makes Valgrind throw errors if a core overflows its savestate size. */
 /* Keep it off unless you're chasing a core bug, it slows things down. */
@@ -175,7 +179,6 @@ static INLINE int compat_ctz(unsigned x)
 }
 #endif
 
-#include <emmintrin.h>
 /* There's no equivalent in libc, you'd think so ...
  * std::mismatch exists, but it's not optimized at all. */
 

menu/cbs/menu_cbs_get_value.c

@@ -28,7 +28,7 @@
 
 #include "../../core_info.h"
 #include "../../core_options.h"
-#include "../../cheats.h"
+#include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../performance.h"
 #include "../../system.h"

menu/cbs/menu_cbs_left.c

@@ -26,7 +26,7 @@
 #include "../menu_navigation.h"
 
 #include "../../core_info.h"
-#include "../../cheats.h"
+#include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../system.h"

menu/cbs/menu_cbs_ok.c

@@ -32,7 +32,7 @@
 #include "../../core_info.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../defaults.h"
-#include "../../cheats.h"
+#include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../input/input_remapping.h"

menu/cbs/menu_cbs_right.c

@@ -26,7 +26,7 @@
 #include "../menu_navigation.h"
 
 #include "../../core_info.h"
-#include "../../cheats.h"
+#include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../system.h"

menu/cbs/menu_cbs_start.c

@@ -26,7 +26,7 @@
 
 #include "../../core_info.h"
 #include "../../core_options.h"
-#include "../../cheats.h"
+#include "../../managers/cheat_manager.h"
 #include "../../general.h"
 #include "../../retroarch.h"
 #include "../../system.h"

menu/menu_displaylist.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "../defaults.h"
-#include "../cheats.h"
+#include "../managers/cheat_manager.h"
 #include "../general.h"
 #include "../retroarch.h"
 #include "../system.h"

menu/menu_input.c

@@ -38,7 +38,7 @@
 #include "menu_hash.h"
 
 #include "../general.h"
-#include "../cheats.h"
+#include "../managers/cheat_manager.h"
 #include "../performance.h"
 #include "../core.h"
 #include "../input/input_joypad_driver.h"

retroarch.c

@@ -59,7 +59,7 @@
 #include "general.h"
 #include "runloop.h"
 #include "performance.h"
-#include "cheats.h"
+#include "managers/cheat_manager.h"
 #include "system.h"
 
 #include "git_version.h"

runloop.c

@@ -38,13 +38,13 @@
 #include "autosave.h"
 #include "core_info.h"
 #include "core_options.h"
-#include "cheats.h"
 #include "configuration.h"
 #include "performance.h"
 #include "movie.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "state_manager.h"
+#include "managers/cheat_manager.h"
+#include "managers/state_manager.h"
 #include "system.h"
 #include "list_special.h"
 #include "audio/audio_driver.h"