Skip to content

Commit 14de1b1

Browse files
fix VulkanWindow.cpp not found in cmake source list
1 parent ed6d2d3 commit 14de1b1

11 files changed

Lines changed: 14 additions & 26 deletions

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
cmake_minimum_required (VERSION 3.17 FATAL_ERROR)
22

3+
set (CMAKE_CXX_STANDARD_REQUIRED ON)
4+
set (CMAKE_CXX_EXTENSIONS OFF)
5+
set (CMAKE_CXX_STANDARD 20)
6+
37
project (RendererEngine
48
VERSION 1.0
59
DESCRIPTION "Renderer Engine is an open-source 2D - 3D rendering engine written in C/C++"
6-
LANGUAGES CXX C
10+
LANGUAGES CXX
711
)
812

913
set_property (GLOBAL PROPERTY USE_FOLDERS ON)

Tetragrama/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ endif ()
3737
target_include_directories (Tetragrama
3838
PRIVATE
3939
include/
40-
include/Components/
41-
# include/Layers/
42-
# include/Messengers/
43-
# include/Helpers/
44-
# include/Importers/
45-
# include/Serializers/
4640
)
4741

4842
target_compile_definitions(Tetragrama

Tetragrama/src/Components/DockspaceUIComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <DockspaceUIComponent.h>
1+
#include <Components/DockspaceUIComponent.h>
22
#include <ZEngine/Logging/LoggerDefinition.h>
33
#include <Event/EventDispatcher.h>
44
#include <imgui_internal.h>

Tetragrama/src/Components/LogUIComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <LogUIComponent.h>
1+
#include <Components/LogUIComponent.h>
22

33
using namespace ZEngine::Logging;
44

Tetragrama/src/Components/ProjectViewUIComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <string_view>
2-
#include <ProjectViewUIComponent.h>
2+
#include <Components/ProjectViewUIComponent.h>
33

44
namespace Tetragrama::Components {
55
ProjectViewUIComponent::ProjectViewUIComponent(std::string_view name, bool visibility) : UIComponent(name, visibility, false) {}

Tetragrama/src/Components/SceneViewportUIComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <string_view>
2-
#include <SceneViewportUIComponent.h>
2+
#include <Components/SceneViewportUIComponent.h>
33
#include <ZEngine/Logging/LoggerDefinition.h>
44
#include <Layers/UILayer.h>
55
#include <Event/EventDispatcher.h>

ZEngine/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ project (ZEngine
99
# Compiler verification in Linux
1010
#
1111

12-
set (CMAKE_CXX_STANDARD_REQUIRED ON)
13-
set (CMAKE_CXX_EXTENSIONS OFF)
14-
set (CMAKE_CXX_STANDARD 20)
1512

1613
# ZEngine source files
1714
#
@@ -74,6 +71,7 @@ src/UIComponent.cpp
7471
src/ValidationStage.cpp
7572
src/VulkanDevice.cpp
7673
src/VulkanLayer.cpp
74+
src/GlfwWindow/VulkanWindow.cpp
7775
)
7876

7977
target_include_directories (zEngineLib
@@ -103,4 +101,5 @@ endif ()
103101

104102
target_compile_definitions(zEngineLib PUBLIC GLM_ENABLE_EXPERIMENTAL)
105103
target_link_libraries (zEngineLib PUBLIC imported::External_libs)
104+
106105
add_subdirectory(tests)

ZEngine/src/CoreWindow.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
#include <functional>
12
#include <Window/CoreWindow.h>
23
#include <ZEngineDef.h>
34
#include <Window/GlfwWindow/VulkanWindow.h>
4-
#include <ZEngine/Engine.h>
5+
#include <Engine.h>
56

67
using namespace ZEngine;
78
using namespace ZEngine::Event;

ZEngine/src/GlfwWindow/VulkanWindow.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <pch.h>
21
#include <Window/GlfwWindow/VulkanWindow.h>
32
#include <Engine.h>
43
#include <Inputs/KeyCode.h>

dependencies.cmake

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)