diff --git a/CMakeLists.txt b/CMakeLists.txt index 773536f..1589597 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,7 +241,7 @@ add_executable(ComSquare sources/Debugger/TileViewer.hpp ui/tileView.ui sources/Renderer/QtRenderer/QtRenderSfml.cpp sources/Renderer/QtRenderer/QtRenderSfml.hpp) -#include_directories(ComSquare sources) +include_directories(ComSquare sources) target_compile_definitions(ComSquare PUBLIC DEBUGGER_ENABLED) diff --git a/sources/Debugger/TileViewer.cpp b/sources/Debugger/TileViewer.cpp index 072254d..b7c0aa3 100644 --- a/sources/Debugger/TileViewer.cpp +++ b/sources/Debugger/TileViewer.cpp @@ -29,7 +29,7 @@ namespace ComSquare::Debugger this->_window->setAttribute(Qt::WA_DeleteOnClose); this->_ui.setupUi(this->_window); - this->_sfWidget(this->_ui.tab); + this->_sfWidget = std::make_unique(this->_ui.tab); this->_window->show(); QEvent::registerEventType(); } diff --git a/sources/Debugger/TileViewer.hpp b/sources/Debugger/TileViewer.hpp index 5a6de45..9515523 100644 --- a/sources/Debugger/TileViewer.hpp +++ b/sources/Debugger/TileViewer.hpp @@ -4,18 +4,15 @@ #pragma once -namespace ComSquare::Renderer -{ - class QtSFML; -} - #include #include #include +#include "PPU/PPU.hpp" #include "ClosableWindow.hpp" #include "../Renderer/QtRenderer/QtSFML.hpp" #include "../../ui/ui_tileView.h" + namespace ComSquare::Debugger { //! @brief window that allow the user to view all data going through the memory bus. @@ -30,7 +27,7 @@ namespace ComSquare::Debugger //! @brief A reference to the ppu ComSquare::PPU::PPU &_ppu; //! @brief the window - Renderer::QtSFML _sfWidget; + std::unique_ptr _sfWidget; public: //! @brief Called when the window is closed. Turn off the debugger. void disableViewer(); diff --git a/sources/Renderer/QtRenderer/QtSFML.cpp b/sources/Renderer/QtRenderer/QtSFML.cpp index 4e6dbbc..48bbfae 100644 --- a/sources/Renderer/QtRenderer/QtSFML.cpp +++ b/sources/Renderer/QtRenderer/QtSFML.cpp @@ -7,6 +7,7 @@ #include #include #include +#include "SNES.hpp" #include "../../Exceptions/DebuggableError.hpp" #include "QtSFML.hpp" diff --git a/sources/Renderer/SFRenderer.cpp b/sources/Renderer/SFRenderer.cpp index b051ff7..82e876f 100644 --- a/sources/Renderer/SFRenderer.cpp +++ b/sources/Renderer/SFRenderer.cpp @@ -8,6 +8,7 @@ #include #include #include +#include "SNES.hpp" #include namespace ComSquare::Renderer diff --git a/sources/Renderer/SFRenderer.hpp b/sources/Renderer/SFRenderer.hpp index 8221ea3..c73c1e5 100644 --- a/sources/Renderer/SFRenderer.hpp +++ b/sources/Renderer/SFRenderer.hpp @@ -6,7 +6,6 @@ #define COMSQUARE_SFRENDERER_HPP #include "IRenderer.hpp" -#include "../SNES.hpp" #include #include #include