diff --git a/Projects/Client/CMakeLists.txt b/Projects/Client/CMakeLists.txt index 12b3186..85372ea 100644 --- a/Projects/Client/CMakeLists.txt +++ b/Projects/Client/CMakeLists.txt @@ -1,3 +1,5 @@ +include_directories(${CMAKE_BINARY_DIR}) + if(COMPILE_PLAYER OR COMPILE_STUDIO) find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets) add_subdirectory(Common) diff --git a/Projects/Client/Common/CMakeLists.txt b/Projects/Client/Common/CMakeLists.txt index 2163f46..8680259 100644 --- a/Projects/Client/Common/CMakeLists.txt +++ b/Projects/Client/Common/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(${DEPENDENCIES_DIR}/GLAD ${CMAKE_BINARY_DIR}/Dependencies/GLAD) project(Common) -set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets glad) +set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets GLAD) qt_standard_project_setup() qt_add_library(Common STATIC diff --git a/Projects/Client/Common/Header/GL/Widget.hpp b/Projects/Client/Common/Header/GL/Widget.hpp index 62db2f9..0cff0cb 100644 --- a/Projects/Client/Common/Header/GL/Widget.hpp +++ b/Projects/Client/Common/Header/GL/Widget.hpp @@ -1,8 +1,9 @@ #pragma once +#include + #include #include -#include #include diff --git a/Projects/Client/Player/Header/MainWindow.hpp b/Projects/Client/Player/Header/MainWindow.hpp index 2835d01..aec09ff 100644 --- a/Projects/Client/Player/Header/MainWindow.hpp +++ b/Projects/Client/Player/Header/MainWindow.hpp @@ -11,4 +11,4 @@ class MainWindow : public QMainWindow protected: void closeEvent(QCloseEvent* event); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/Projects/Client/Studio/Header/MainWindow.hpp b/Projects/Client/Studio/Header/MainWindow.hpp index ce04801..e5e6c30 100644 --- a/Projects/Client/Studio/Header/MainWindow.hpp +++ b/Projects/Client/Studio/Header/MainWindow.hpp @@ -18,4 +18,4 @@ class MainWindow : public QMainWindow protected: void closeEvent(QCloseEvent* event); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/Projects/Client/Studio/Source/MainWindow.cpp b/Projects/Client/Studio/Source/MainWindow.cpp index 807de07..da731e0 100644 --- a/Projects/Client/Studio/Source/MainWindow.cpp +++ b/Projects/Client/Studio/Source/MainWindow.cpp @@ -1,4 +1,6 @@ #include +#include +#include "Resources/StudioResources.hpp" MainWindow::MainWindow() { @@ -8,8 +10,8 @@ MainWindow::MainWindow() QWidget* content_widget = new QWidget(); QGridLayout* grid = new QGridLayout(); - this->graphics_widget = new GL::Widget(); - grid->addWidget(this->graphics_widget, 0, 0, 1, 1); + this->widget = new GL::Widget(); + grid->addWidget(this->widget, 0, 0, 1, 1); content_widget->setLayout(grid); setWindowTitle(QString("RNR Studio")); diff --git a/Projects/Client/Studio/Source/main.cpp b/Projects/Client/Studio/Source/main.cpp index 3cb05f6..fcb98b9 100644 --- a/Projects/Client/Studio/Source/main.cpp +++ b/Projects/Client/Studio/Source/main.cpp @@ -21,6 +21,6 @@ int main(int argc, char** argv) while (running) { app.processEvents(); - window.graphics_widget->update(); + window.widget->update(); } } \ No newline at end of file diff --git a/Projects/Engine/Source/Network/GUID.cpp b/Projects/Engine/Source/Network/GUID.cpp index d316b8f..065c032 100644 --- a/Projects/Engine/Source/Network/GUID.cpp +++ b/Projects/Engine/Source/Network/GUID.cpp @@ -1,4 +1,4 @@ -#include +#include namespace RNR {