diff --git a/CMakeLists.txt b/CMakeLists.txt index 29d80a49..17cb947d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,6 @@ qt_add_resources( FILES "./resources/bloom.template.yaml" "./resources/help.txt" - "./resources/gdbHelpMonitorInfo.txt" ) add_subdirectory(src) diff --git a/src/DebugServer/CMakeLists.txt b/src/DebugServer/CMakeLists.txt index 5d7e1bfd..c7fac4ab 100755 --- a/src/DebugServer/CMakeLists.txt +++ b/src/DebugServer/CMakeLists.txt @@ -36,3 +36,14 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/CommandPackets/FlashWrite.cpp ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/CommandPackets/FlashDone.cpp ) + +# DebugServer resources +qt_add_resources( + Bloom + "DebugServerResources" + PREFIX + "/compiled/src/DebugServer" + FILES + # GDB RSP Server + "./Gdb/Resources/GdbHelpMonitorInfo.txt" +) diff --git a/src/DebugServer/Gdb/CommandPackets/HelpMonitorInfo.cpp b/src/DebugServer/Gdb/CommandPackets/HelpMonitorInfo.cpp index b43cb7a1..4217ed8f 100644 --- a/src/DebugServer/Gdb/CommandPackets/HelpMonitorInfo.cpp +++ b/src/DebugServer/Gdb/CommandPackets/HelpMonitorInfo.cpp @@ -28,11 +28,13 @@ namespace Bloom::DebugServer::Gdb::CommandPackets try { /* - * The file gdbHelpMonitorInfo.txt is included in the binary image as a resource. See the root-level - * CMakeLists.txt for more. + * The file GdbHelpMonitorInfo.txt is included in the binary image as a resource. + * See src/DebugServer/CMakeLists.txt for more. */ auto helpFile = QFile( - QString::fromStdString(Paths::compiledResourcesPath() + "/resources/gdbHelpMonitorInfo.txt") + QString::fromStdString( + Paths::compiledResourcesPath() + "/src/DebugServer/Gdb/Resources/GdbHelpMonitorInfo.txt" + ) ); if (!helpFile.open(QIODevice::ReadOnly)) { diff --git a/resources/gdbHelpMonitorInfo.txt b/src/DebugServer/Gdb/Resources/GdbHelpMonitorInfo.txt similarity index 100% rename from resources/gdbHelpMonitorInfo.txt rename to src/DebugServer/Gdb/Resources/GdbHelpMonitorInfo.txt