diff options
| author |  ShizZy | 2013-10-03 17:47:31 -0400 |
|---|---|---|
| committer | ShizZy | 2013-10-03 17:47:31 -0400 |
| commit | e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a (patch) | |
| tree | 65007fada1b869db926700b2f78eb4ff0546ad4c /src/citra | |
| parent | added core_timing and system modules to core vcproj (diff) | |
| download | yuzu-e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a.tar.gz yuzu-e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a.tar.xz yuzu-e0cb54ea35a79ce0268be8a20c0a6d6fb10d608a.zip | |
moved some core functions over to system module
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/src/citra.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/src/citra.cpp b/src/citra/src/citra.cpp index eb0290687..fc4610405 100644 --- a/src/citra/src/citra.cpp +++ b/src/citra/src/citra.cpp | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include "log_manager.h" | 26 | #include "log_manager.h" |
| 27 | #include "file_util.h" | 27 | #include "file_util.h" |
| 28 | 28 | ||
| 29 | #include "core.h" | 29 | #include "system.h" |
| 30 | 30 | ||
| 31 | #include "emu_window/emu_window_glfw.h" | 31 | #include "emu_window/emu_window_glfw.h" |
| 32 | 32 | ||
| @@ -46,7 +46,7 @@ int __cdecl main(int argc, char **argv) { | |||
| 46 | 46 | ||
| 47 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; | 47 | EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; |
| 48 | 48 | ||
| 49 | Core::Init(emu_window); | 49 | System::Init(emu_window); |
| 50 | 50 | ||
| 51 | //if (E_OK != core::Init(emu_window)) { | 51 | //if (E_OK != core::Init(emu_window)) { |
| 52 | // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); | 52 | // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); |