zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2025-12-19 13:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing include recursive

Browse Source
This commit is contained in:
Clément Le Bihan
2021-05-19 10:03:45 +02:00
parent dbf3f6aaa4
commit cf1c6614c1
6 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -241,7 +241,7 @@ add_executable(ComSquare
sources/Debugger/TileViewer.hpp sources/Debugger/TileViewer.hpp
ui/tileView.ui sources/Renderer/QtRenderer/QtRenderSfml.cpp sources/Renderer/QtRenderer/QtRenderSfml.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) target_compile_definitions(ComSquare PUBLIC DEBUGGER_ENABLED)

2
sources/Debugger/TileViewer.cpp
View File

@@ -29,7 +29,7 @@ namespace ComSquare::Debugger
this->_window->setAttribute(Qt::WA_DeleteOnClose); this->_window->setAttribute(Qt::WA_DeleteOnClose);
this->_ui.setupUi(this->_window); this->_ui.setupUi(this->_window);
this->_sfWidget(this->_ui.tab); this->_sfWidget = std::make_unique<Renderer::QtSFML>(this->_ui.tab);
this->_window->show(); this->_window->show();
QEvent::registerEventType(); QEvent::registerEventType();
} }

9
sources/Debugger/TileViewer.hpp
View File

@@ -4,18 +4,15 @@
#pragma once #pragma once
namespace ComSquare::Renderer
{
class QtSFML;
}
#include <QtCore/QSortFilterProxyModel> #include <QtCore/QSortFilterProxyModel>
#include <QEvent> #include <QEvent>
#include <QMouseEvent> #include <QMouseEvent>
#include "PPU/PPU.hpp"
#include "ClosableWindow.hpp" #include "ClosableWindow.hpp"
#include "../Renderer/QtRenderer/QtSFML.hpp" #include "../Renderer/QtRenderer/QtSFML.hpp"
#include "../../ui/ui_tileView.h" #include "../../ui/ui_tileView.h"
namespace ComSquare::Debugger namespace ComSquare::Debugger
{ {
//! @brief window that allow the user to view all data going through the memory bus. //! @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 //! @brief A reference to the ppu
ComSquare::PPU::PPU &_ppu; ComSquare::PPU::PPU &_ppu;
//! @brief the window //! @brief the window
Renderer::QtSFML _sfWidget; std::unique_ptr<Renderer::QtSFML> _sfWidget;
public: public:
//! @brief Called when the window is closed. Turn off the debugger. //! @brief Called when the window is closed. Turn off the debugger.
void disableViewer(); void disableViewer();

1
sources/Renderer/QtRenderer/QtSFML.cpp
View File

@@ -7,6 +7,7 @@
#include <QIcon> #include <QIcon>
#include <QMenuBar> #include <QMenuBar>
#include <iostream> #include <iostream>
#include "SNES.hpp"
#include "../../Exceptions/DebuggableError.hpp" #include "../../Exceptions/DebuggableError.hpp"
#include "QtSFML.hpp" #include "QtSFML.hpp"

1
sources/Renderer/SFRenderer.cpp
View File

@@ -8,6 +8,7 @@
#include <SFML/System.hpp> #include <SFML/System.hpp>
#include <SFML/Window.hpp> #include <SFML/Window.hpp>
#include <SFML/Graphics/RenderWindow.hpp> #include <SFML/Graphics/RenderWindow.hpp>
#include "SNES.hpp"
#include <iostream> #include <iostream>
namespace ComSquare::Renderer namespace ComSquare::Renderer

1
sources/Renderer/SFRenderer.hpp
View File

@@ -6,7 +6,6 @@
#define COMSQUARE_SFRENDERER_HPP #define COMSQUARE_SFRENDERER_HPP
#include "IRenderer.hpp" #include "IRenderer.hpp"
#include "../SNES.hpp"
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include <SFML/Audio.hpp> #include <SFML/Audio.hpp>
#include <SFML/System.hpp> #include <SFML/System.hpp>