OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 20:40:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix rebase issues

Browse Source
This commit is contained in:
Anon 2016-12-24 17:48:00 -06:00
parent 06ef32f450
commit c761825753
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra_qt/bootmanager.cpp
View File

@ -14,7 +14,6 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/settings.h" #include "core/settings.h"
#include "core/system.h"
#include "input_core/devices/keyboard.h" #include "input_core/devices/keyboard.h"
#include "input_core/input_core.h" #include "input_core/input_core.h"

2
src/core/CMakeLists.txt
View File

@ -30,7 +30,6 @@ set(SRCS
file_sys/path_parser.cpp file_sys/path_parser.cpp
file_sys/savedata_archive.cpp file_sys/savedata_archive.cpp
frontend/emu_window.cpp frontend/emu_window.cpp
frontend/key_map.cpp
gdbstub/gdbstub.cpp gdbstub/gdbstub.cpp
hle/config_mem.cpp hle/config_mem.cpp
hle/applets/applet.cpp hle/applets/applet.cpp
@ -201,7 +200,6 @@ set(HEADERS
file_sys/path_parser.h file_sys/path_parser.h
file_sys/savedata_archive.h file_sys/savedata_archive.h
frontend/emu_window.h frontend/emu_window.h
frontend/key_map.h
gdbstub/gdbstub.h gdbstub/gdbstub.h
hle/config_mem.h hle/config_mem.h
hle/function_wrappers.h hle/function_wrappers.h

3
src/core/core.cpp
View File

@ -19,6 +19,7 @@
#include "core/hw/hw.h" #include "core/hw/hw.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "core/settings.h" #include "core/settings.h"
#include "input_core/input_core.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
namespace Core { namespace Core {
@ -140,6 +141,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
Kernel::Init(system_mode); Kernel::Init(system_mode);
Service::Init(); Service::Init();
AudioCore::Init(); AudioCore::Init();
InputCore::Init();
GDBStub::Init(); GDBStub::Init();
if (!VideoCore::Init(emu_window)) { if (!VideoCore::Init(emu_window)) {
@ -153,6 +155,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
void System::Shutdown() { void System::Shutdown() {
GDBStub::Shutdown(); GDBStub::Shutdown();
InputCore::Shutdown();
AudioCore::Shutdown(); AudioCore::Shutdown();
VideoCore::Shutdown(); VideoCore::Shutdown();
Service::Shutdown(); Service::Shutdown();

2
src/core/hle/service/hid/hid.cpp
View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cmath> #include <cmath>
#include "common/emu_window.h"
#include "core/frontend/emu_window.h"
#include "core/hle/service/hid/hid.h" #include "core/hle/service/hid/hid.h"
#include "core/hle/service/hid/hid_spvr.h" #include "core/hle/service/hid/hid_spvr.h"
#include "core/hle/service/hid/hid_user.h" #include "core/hle/service/hid/hid_user.h"