diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2016-02-21 14:13:52 +0100 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-02-21 14:13:52 +0100 |
commit | 8b00954ec79fad71691ad2d4c82d5c1c60e21b0c (patch) | |
tree | 443d275fd39c58928e68ef22ce3fe0fa56c73642 /src/core/system.cpp | |
parent | Merge pull request #1406 from MerryMage/bitfield2 (diff) | |
download | yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar.gz yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar.bz2 yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar.lz yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar.xz yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.tar.zst yuzu-8b00954ec79fad71691ad2d4c82d5c1c60e21b0c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/system.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 7e9c56538..b62ebf69e 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2,9 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/audio_core.h" + #include "core/core.h" #include "core/core_timing.h" #include "core/system.h" +#include "core/gdbstub/gdbstub.h" #include "core/hw/hw.h" #include "core/hle/hle.h" #include "core/hle/kernel/kernel.h" @@ -12,8 +15,6 @@ #include "video_core/video_core.h" -#include "core/gdbstub/gdbstub.h" - namespace System { void Init(EmuWindow* emu_window) { @@ -24,11 +25,13 @@ void Init(EmuWindow* emu_window) { Kernel::Init(); HLE::Init(); VideoCore::Init(emu_window); + AudioCore::Init(); GDBStub::Init(); } void Shutdown() { GDBStub::Shutdown(); + AudioCore::Shutdown(); VideoCore::Shutdown(); HLE::Shutdown(); Kernel::Shutdown(); |