diff options
| author | ShizZy <shizzy@6bit.net> | 2013-09-19 04:35:45 +0200 |
|---|---|---|
| committer | ShizZy <shizzy@6bit.net> | 2013-09-19 04:35:45 +0200 |
| commit | 9a248afb5a13154b2f14e7c1a2cbf771bef497e6 (patch) | |
| tree | 11a34744fe797d032cab93e31efd749038caa7fc /src | |
| parent | removed CORE and LOADER from LogTypes (diff) | |
| download | yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.gz yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.bz2 yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.lz yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.xz yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.tar.zst yuzu-9a248afb5a13154b2f14e7c1a2cbf771bef497e6.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/citrus/src/citrus.cpp | 8 |
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 @@ #include "log_manager.h" #include "file_util.h" -//#if EMU_PLATFORM == PLATFORM_LINUX -//#include <unistd.h> -//#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..."); |