diff --git a/Makefile.common b/Makefile.common index ccdaf3d510..7781a4f074 100644 --- a/Makefile.common +++ b/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 \ diff --git a/command_event.c b/command_event.c index 96b6e1cf7a..9e76c7e979 100644 --- a/command_event.c +++ b/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" diff --git a/core_impl.c b/core_impl.c index 46941813cc..163ed55396 100644 --- a/core_impl.c +++ b/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" diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index b74363bf67..c54ac7366d 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/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" diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 0cbf335aa6..632806c3ba 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/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 diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c index 5fbf0ae3aa..26467efafa 100644 --- a/gfx/drivers_shader/shader_hlsl.c +++ b/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" diff --git a/griffin/griffin.c b/griffin/griffin.c index e6f0a632ec..040ae67b99 100644 --- a/griffin/griffin.c +++ b/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 diff --git a/cheats.c b/managers/cheat_manager.c similarity index 98% rename from cheats.c rename to managers/cheat_manager.c index 65a7785b3a..1ef5afb63c 100644 --- a/cheats.c +++ b/managers/cheat_manager.c @@ -23,18 +23,18 @@ #include #include -#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 diff --git a/cheats.h b/managers/cheat_manager.h similarity index 100% rename from cheats.h rename to managers/cheat_manager.h diff --git a/state_manager.c b/managers/state_manager.c similarity index 98% rename from state_manager.c rename to managers/state_manager.c index cd7ee598d7..e47e8ca500 100644 --- a/state_manager.c +++ b/managers/state_manager.c @@ -19,17 +19,21 @@ #include #include +#if __SSE2__ +#include +#endif + #include #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 /* There's no equivalent in libc, you'd think so ... * std::mismatch exists, but it's not optimized at all. */ diff --git a/state_manager.h b/managers/state_manager.h similarity index 100% rename from state_manager.h rename to managers/state_manager.h diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 78a96ea09a..00a89387e4 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/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" diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index a33c3aa7ca..cbcb4763c3 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/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" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e071edb3c3..59d9f1696c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/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" diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index e2d334a7f3..f57a1be697 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/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" diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index c9731b385e..f6b467546a 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/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" diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 30e84a6727..7383c4ecdd 100644 --- a/menu/menu_displaylist.c +++ b/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" diff --git a/menu/menu_input.c b/menu/menu_input.c index 65d37d66a1..a8d76940be 100644 --- a/menu/menu_input.c +++ b/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" diff --git a/retroarch.c b/retroarch.c index 88c55ae5df..2552f43d77 100644 --- a/retroarch.c +++ b/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" diff --git a/runloop.c b/runloop.c index a61dc2f21a..214f8c053e 100644 --- a/runloop.c +++ b/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"