diff options
author | bunnei <ericbunnie@gmail.com> | 2014-04-18 23:52:49 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-04-18 23:52:49 +0200 |
commit | 958bca606e80110e05d7c142dda3097fddc96503 (patch) | |
tree | 576917751444b4dfdb476d040b4e075bde431b7b /src/core/system.cpp | |
parent | Init window size from VideoCore. Start changing the default window behavior... (diff) | |
parent | renamed hw_lcd module to just lcd (diff) | |
download | yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.gz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.bz2 yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.lz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.xz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.zst yuzu-958bca606e80110e05d7c142dda3097fddc96503.zip |
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r-- | src/core/system.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index edb07fef5..c77092327 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -7,6 +7,7 @@ #include "core/mem_map.h" #include "core/system.h" #include "core/hw/hw.h" +#include "core/hle/hle.h" #include "video_core/video_core.h" @@ -19,15 +20,16 @@ void UpdateState(State state) { } void Init(EmuWindow* emu_window) { - Core::Init(); - Memory::Init(); + Core::Init(); + Memory::Init(); HW::Init(); - CoreTiming::Init(); + HLE::Init(); + CoreTiming::Init(); VideoCore::Init(emu_window); } void RunLoopFor(int cycles) { - RunLoopUntil(CoreTiming::GetTicks() + cycles); + RunLoopUntil(CoreTiming::GetTicks() + cycles); } void RunLoopUntil(u64 global_cycles) { @@ -35,9 +37,12 @@ void RunLoopUntil(u64 global_cycles) { void Shutdown() { Core::Shutdown(); + Memory::Shutdown(); HW::Shutdown(); + HLE::Shutdown(); + CoreTiming::Shutdown(); VideoCore::Shutdown(); - g_ctr_file_system.Shutdown(); + g_ctr_file_system.Shutdown(); } } // namespace |