chore: remove src/ from include path

GameDevTecnico · Sep 27, 2023 · ee1a535 · ee1a535
1 parent 8ffbcf6
commit ee1a535
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -85,7 +85,7 @@ set(CUBOS_CORE_SOURCE
 # Create core library
 
 add_library(cubos-core ${CUBOS_CORE_SOURCE})
-target_include_directories(cubos-core PUBLIC "include" PRIVATE "src")
+target_include_directories(cubos-core PUBLIC "include")
 target_compile_definitions(cubos-core PUBLIC
     -DCUBOS_CORE_ECS_MAX_COMPONENTS=${CUBOS_CORE_ECS_MAX_COMPONENTS}
     -DCUBOS_CORE_DISPATCHER_MAX_CONDITIONS=${CUBOS_CORE_DISPATCHER_MAX_CONDITIONS}

diff --git a/core/src/cubos/core/al/audio_device.cpp b/core/src/cubos/core/al/audio_device.cpp
@@ -1,4 +1,4 @@
-#include <cubos/core/al/oal_audio_device.hpp>
+#include "oal_audio_device.hpp"
 
 using namespace cubos::core::al;
 

diff --git a/core/src/cubos/core/al/oal_audio_device.cpp b/core/src/cubos/core/al/oal_audio_device.cpp
@@ -1,4 +1,5 @@
-#include <cubos/core/al/oal_audio_device.hpp>
+#include "oal_audio_device.hpp"
+
 #include <cubos/core/log.hpp>
 
 #ifdef WITH_OPENAL

diff --git a/core/src/cubos/core/gl/ogl_render_device.cpp b/core/src/cubos/core/gl/ogl_render_device.cpp
@@ -6,9 +6,10 @@
 
 #include <glad/glad.h>
 
-#include <cubos/core/gl/ogl_render_device.hpp>
 #include <cubos/core/log.hpp>
 
+#include "ogl_render_device.hpp"
+
 using namespace cubos::core;
 using namespace cubos::core::gl;
 

diff --git a/core/src/cubos/core/io/glfw_window.cpp b/core/src/cubos/core/io/glfw_window.cpp
@@ -1,9 +1,11 @@
+#include "glfw_window.hpp"
+
 #include <glad/glad.h>
 
-#include <cubos/core/gl/ogl_render_device.hpp>
-#include <cubos/core/io/glfw_window.hpp>
 #include <cubos/core/log.hpp>
 
+#include "../gl/ogl_render_device.hpp"
+
 using namespace cubos::core;
 using namespace cubos::core::io;
 

diff --git a/core/src/cubos/core/io/glfw_window.hpp b/core/src/cubos/core/io/glfw_window.hpp
@@ -8,7 +8,7 @@
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 
-#include <cubos/core/gl/ogl_render_device.hpp>
+#include "../gl/ogl_render_device.hpp"
 #endif
 
 #include <cubos/core/io/window.hpp>

diff --git a/core/src/cubos/core/io/window.cpp b/core/src/cubos/core/io/window.cpp
@@ -1,6 +1,7 @@
-#include <cubos/core/io/glfw_window.hpp>
 #include <cubos/core/io/window.hpp>
 
+#include "glfw_window.hpp"
+
 using namespace cubos::core::io;
 
 Window cubos::core::io::openWindow(const std::string& title, const glm::ivec2& size)

diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -65,7 +65,7 @@ set(CUBOS_ENGINE_SOURCE
 
 # Create cubos engine
 add_library(cubos-engine ${CUBOS_ENGINE_SOURCE})
-target_include_directories(cubos-engine PUBLIC "include" PRIVATE "src")
+target_include_directories(cubos-engine PUBLIC "include")
 target_link_libraries(cubos-engine PUBLIC cubos-core)
 cubos_common_target_options(cubos-engine)