diff options
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 43d0eef2c..d6188f055 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/core.h" | 5 | #include "core/core.h" |
| @@ -23,10 +23,10 @@ void Init(EmuWindow* emu_window) { | |||
| 23 | Core::Init(); | 23 | Core::Init(); |
| 24 | Memory::Init(); | 24 | Memory::Init(); |
| 25 | HW::Init(); | 25 | HW::Init(); |
| 26 | Kernel::Init(); | ||
| 26 | HLE::Init(); | 27 | HLE::Init(); |
| 27 | CoreTiming::Init(); | 28 | CoreTiming::Init(); |
| 28 | VideoCore::Init(emu_window); | 29 | VideoCore::Init(emu_window); |
| 29 | Kernel::Init(); | ||
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | void RunLoopFor(int cycles) { | 32 | void RunLoopFor(int cycles) { |
| @@ -37,13 +37,13 @@ void RunLoopUntil(u64 global_cycles) { | |||
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | void Shutdown() { | 39 | void Shutdown() { |
| 40 | Core::Shutdown(); | ||
| 41 | Memory::Shutdown(); | ||
| 42 | HW::Shutdown(); | ||
| 43 | HLE::Shutdown(); | ||
| 44 | CoreTiming::Shutdown(); | ||
| 45 | VideoCore::Shutdown(); | 40 | VideoCore::Shutdown(); |
| 41 | CoreTiming::Shutdown(); | ||
| 42 | HLE::Shutdown(); | ||
| 46 | Kernel::Shutdown(); | 43 | Kernel::Shutdown(); |
| 44 | HW::Shutdown(); | ||
| 45 | Memory::Shutdown(); | ||
| 46 | Core::Shutdown(); | ||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | } // namespace | 49 | } // namespace |