ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix non-debugger build (fixes #3049)

This commit is contained in:
Vicki Pfau 2023-10-25 15:22:09 -07:00
parent 6ecc182d7c
commit 9c9f31d0d1
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/CMakeLists.txt
View File

@ -125,7 +125,6 @@ set(SOURCE_FILES
LogView.cpp LogView.cpp
LogWidget.cpp LogWidget.cpp
MapView.cpp MapView.cpp
MemoryAccessLogView.cpp
MemoryDump.cpp MemoryDump.cpp
MemoryModel.cpp MemoryModel.cpp
MemorySearch.cpp MemorySearch.cpp
@ -248,7 +247,8 @@ if(USE_DEBUGGERS)
list(APPEND SOURCE_FILES list(APPEND SOURCE_FILES
DebuggerController.cpp DebuggerController.cpp
DebuggerConsole.cpp DebuggerConsole.cpp
DebuggerConsoleController.cpp) DebuggerConsoleController.cpp
MemoryAccessLogView.cpp)
endif() endif()
if(USE_GDB_STUB) if(USE_GDB_STUB)

2
src/platform/qt/Window.cpp
View File

@ -1707,7 +1707,9 @@ void Window::setupMenu(QMenuBar* menubar) {
addGameAction(tr("Search memory..."), "memorySearch", openControllerTView<MemorySearch>(), "stateViews"); addGameAction(tr("Search memory..."), "memorySearch", openControllerTView<MemorySearch>(), "stateViews");
addGameAction(tr("View &I/O registers..."), "ioViewer", openControllerTView<IOViewer>(), "stateViews"); addGameAction(tr("View &I/O registers..."), "ioViewer", openControllerTView<IOViewer>(), "stateViews");
#ifdef USE_DEBUGGERS
addGameAction(tr("Log memory &accesses..."), "memoryAccessView", openControllerTView<MemoryAccessLogView>(), "tools"); addGameAction(tr("Log memory &accesses..."), "memoryAccessView", openControllerTView<MemoryAccessLogView>(), "tools");
#endif
#if defined(USE_FFMPEG) && defined(M_CORE_GBA) #if defined(USE_FFMPEG) && defined(M_CORE_GBA)
m_actions.addSeparator("tools"); m_actions.addSeparator("tools");

2
src/platform/qt/scripting/ScriptingController.cpp
View File

@ -301,7 +301,9 @@ void ScriptingController::updateGamepad() {
void ScriptingController::attach() { void ScriptingController::attach() {
CoreController::Interrupter interrupter(m_controller); CoreController::Interrupter interrupter(m_controller);
mScriptContextAttachCore(&m_scriptContext, m_controller->thread()->core); mScriptContextAttachCore(&m_scriptContext, m_controller->thread()->core);
#ifdef USE_DEBUGGERS
m_controller->attachDebugger(false); m_controller->attachDebugger(false);
#endif
} }
void ScriptingController::attachGamepad() { void ScriptingController::attachGamepad() {