From 8c789f57cba3d0821231d39ec8953574710800f0 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Thu, 23 Dec 2021 00:45:24 +0100 Subject: [PATCH] changed include names --- CMakeLists.txt | 5 +---- include/lol/lol.hpp | 4 +++- src/Drawable.cpp | 2 +- src/Shader.cpp | 2 +- src/Transformable.cpp | 2 +- src/VertexArrayObject.cpp | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a544d27..bef597c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,7 @@ add_library(lol STATIC "src/Transformable.cpp" "src/Shader.cpp" "src/VertexArrayObject.cpp" -) - -target_sources(lol PUBLIC - vendor/glad/src/glad.c + "vendor/glad/src/glad.c" ) target_include_directories(lol PUBLIC diff --git a/include/lol/lol.hpp b/include/lol/lol.hpp index aea4315..cac1228 100644 --- a/include/lol/lol.hpp +++ b/include/lol/lol.hpp @@ -4,4 +4,6 @@ #include #include #include -#include \ No newline at end of file +#include +#include +#include \ No newline at end of file diff --git a/src/Drawable.cpp b/src/Drawable.cpp index 9e75add..eb75cc2 100644 --- a/src/Drawable.cpp +++ b/src/Drawable.cpp @@ -1,4 +1,4 @@ -#include "backend/Drawable.hpp" +#include void Drawable::Draw(const CameraBase& camera) const { diff --git a/src/Shader.cpp b/src/Shader.cpp index 21bf597..9808373 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -1,4 +1,4 @@ -#include "backend/Shader.hpp" +#include #include diff --git a/src/Transformable.cpp b/src/Transformable.cpp index 860d29f..563ce62 100644 --- a/src/Transformable.cpp +++ b/src/Transformable.cpp @@ -1,4 +1,4 @@ -#include "backend/Transformable.hpp" +#include Transformable::Transformable() : position(0.0f), scale(1.0f), orientation(glm::vec3(0.0, 0.0, 0.0)) diff --git a/src/VertexArrayObject.cpp b/src/VertexArrayObject.cpp index e604376..ec9a990 100644 --- a/src/VertexArrayObject.cpp +++ b/src/VertexArrayObject.cpp @@ -1,4 +1,4 @@ -#include "backend/VertexArrayObject.hpp" +#include #include #include