diff options
Diffstat (limited to 'src/citra')
-rw-r--r-- | src/citra/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/citra/citra.cpp | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 0023da2b..147f51e9 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -7,6 +7,6 @@ if (NOT X11_xf86vmode_LIB) endif() add_executable(citra ${SRCS}) -target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) +target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB}) #install(TARGETS citra RUNTIME DESTINATION ${bindir}) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 80896505..5a8642d1 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -18,11 +18,11 @@ int __cdecl main(int argc, char **argv) { std::string program_dir = File::GetCurrentDir(); - LogManager::Init(); + LogManager::Init(); EmuWindow_GLFW* emu_window = new EmuWindow_GLFW; - System::Init(emu_window); + System::Init(emu_window); std::string boot_filename; @@ -33,18 +33,16 @@ int __cdecl main(int argc, char **argv) { boot_filename = argv[1]; } std::string error_str; - + bool res = Loader::LoadFile(boot_filename, &error_str); if (!res) { ERROR_LOG(BOOT, "Failed to load ROM: %s", error_str.c_str()); } - for (;;) { - Core::SingleStep(); - } + Core::RunLoop(); delete emu_window; - return 0; + return 0; } |