diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 4b05a909d..d851a8b4a 100644 --- 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 index 32431c689..df78baa60 100644 --- a/core/src/cubos/core/al/audio_device.cpp +++ b/core/src/cubos/core/al/audio_device.cpp @@ -1,4 +1,4 @@ -#include +#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 index 658b4ba29..c5b522ff1 100644 --- 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 +#include "oal_audio_device.hpp" + #include #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 index 2938f1514..3851049a0 100644 --- 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 -#include #include +#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 index 79f350038..19c0466d0 100644 --- 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 -#include -#include #include +#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 index 6f80985eb..470617573 100644 --- 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 -#include +#include "../gl/ogl_render_device.hpp" #endif #include diff --git a/core/src/cubos/core/io/window.cpp b/core/src/cubos/core/io/window.cpp index e79e52076..356f9ad5d 100644 --- a/core/src/cubos/core/io/window.cpp +++ b/core/src/cubos/core/io/window.cpp @@ -1,6 +1,7 @@ -#include #include +#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 index f484dbf4d..c67b4f912 100644 --- 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)