summaryrefslogtreecommitdiff
path: root/src/citrus
diff options
context:
space:
mode:
authorGravatar ShizZy2013-09-18 22:35:45 -0400
committerGravatar ShizZy2013-09-18 22:35:45 -0400
commit9a248afb5a13154b2f14e7c1a2cbf771bef497e6 (patch)
tree11a34744fe797d032cab93e31efd749038caa7fc /src/citrus
parentremoved CORE and LOADER from LogTypes (diff)
downloadyuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.gz
yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.xz
yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.zip
added core initialization to app entry point
Diffstat (limited to 'src/citrus')
-rw-r--r--src/citrus/src/citrus.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/citrus/src/citrus.cpp b/src/citrus/src/citrus.cpp
index 5471251ba..faeacc290 100644
--- a/src/citrus/src/citrus.cpp
+++ b/src/citrus/src/citrus.cpp
@@ -26,9 +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//#if EMU_PLATFORM == PLATFORM_LINUX 29#include "core.h"
30//#include <unistd.h>
31//#endif
32 30
33#include "emu_window/emu_window_glfw.h" 31#include "emu_window/emu_window_glfw.h"
34 32
@@ -46,9 +44,9 @@ int __cdecl main(int argc, char **argv) {
46 44
47 LogManager::Init(); 45 LogManager::Init();
48 46
49 NOTICE_LOG(ARM11, "Test\n"); 47 EmuWindow_GLFW* emu_window = new EmuWindow_GLFW;
50 48
51 //EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; 49 Core::Init(emu_window);
52 50
53 //if (E_OK != core::Init(emu_window)) { 51 //if (E_OK != core::Init(emu_window)) {
54 // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); 52 // LOG_ERROR(TMASTER, "core initialization failed, exiting...");