From 9a248afb5a13154b2f14e7c1a2cbf771bef497e6 Mon Sep 17 00:00:00 2001 From: ShizZy Date: Wed, 18 Sep 2013 22:35:45 -0400 Subject: added core initialization to app entry point --- src/citrus/src/citrus.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/citrus') 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 @@ #include "log_manager.h" #include "file_util.h" -//#if EMU_PLATFORM == PLATFORM_LINUX -//#include -//#endif +#include "core.h" #include "emu_window/emu_window_glfw.h" @@ -46,9 +44,9 @@ int __cdecl main(int argc, char **argv) { LogManager::Init(); - NOTICE_LOG(ARM11, "Test\n"); + EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; - //EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; + Core::Init(emu_window); //if (E_OK != core::Init(emu_window)) { // LOG_ERROR(TMASTER, "core initialization failed, exiting..."); -- cgit v1.2.3