diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 17 |
2 files changed, 29 insertions, 20 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 5ce4e3f16..ff1fbc460 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -14,7 +14,7 @@ set(SRCS config/controller_config.cpp config/controller_config_util.cpp) -set (HEADERS +set(HEADERS bootmanager.hxx debugger/callstack.hxx debugger/disassembler.hxx @@ -26,24 +26,30 @@ set (HEADERS config/controller_config.hxx config/controller_config_util.hxx) -qt4_wrap_ui(UI_HDRS - debugger/callstack.ui - debugger/disassembler.ui - debugger/registers.ui - hotkeys.ui - main.ui - config/controller_config.ui) +set(UIS + debugger/callstack.ui + debugger/disassembler.ui + debugger/registers.ui + hotkeys.ui + main.ui + config/controller_config.ui) -# add uic results to include directories -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +if(USE_QT5) + qt5_wrap_ui(UI_HDRS ${UIS}) +else() + qt4_wrap_ui(UI_HDRS ${UIS}) +endif() -add_executable(citra-qt ${SRCS} ${UI_HDRS}) -if (APPLE) +add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) +if(APPLE) set(ICONV_LIBRARY iconv) else() set(RT_LIBRARY rt) endif() -target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) +target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY}) +if(USE_QT5) + target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL) +endif() #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 250df59f8..b0aa1e561 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -32,14 +32,17 @@ void EmuThread::run() { while (true) { - if (cpu_running || exec_cpu_step) + for (int tight_loop = 0; tight_loop < 10000; ++tight_loop) { - if (exec_cpu_step) - exec_cpu_step = false; - - Core::SingleStep(); - if (!cpu_running) - emit CPUStepped(); + if (cpu_running || exec_cpu_step) + { + if (exec_cpu_step) + exec_cpu_step = false; + + Core::SingleStep(); + if (!cpu_running) + emit CPUStepped(); + } } } |