diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-16 04:15:08 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-16 04:15:08 +0100 |
commit | cd2a31eaf4a35568a18840eba7d3cdac59881d2f (patch) | |
tree | 37a4d61adebae300e8ef172538c6a2d2eae80ff1 /src/core/system.cpp | |
parent | Update README.md (diff) | |
parent | Work around libstdc++'s lack of support for std::hash on enums (diff) | |
download | yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.gz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.bz2 yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.lz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.xz yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.tar.zst yuzu-cd2a31eaf4a35568a18840eba7d3cdac59881d2f.zip |
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r-- | src/core/system.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 43d0eef2c..2885ff45f 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -23,10 +23,10 @@ void Init(EmuWindow* emu_window) { Core::Init(); Memory::Init(); HW::Init(); + Kernel::Init(); HLE::Init(); CoreTiming::Init(); VideoCore::Init(emu_window); - Kernel::Init(); } void RunLoopFor(int cycles) { @@ -37,13 +37,13 @@ void RunLoopUntil(u64 global_cycles) { } void Shutdown() { - Core::Shutdown(); - Memory::Shutdown(); - HW::Shutdown(); - HLE::Shutdown(); - CoreTiming::Shutdown(); VideoCore::Shutdown(); + CoreTiming::Shutdown(); + HLE::Shutdown(); Kernel::Shutdown(); + HW::Shutdown(); + Memory::Shutdown(); + Core::Shutdown(); } } // namespace |