diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 09:48:05 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-06 09:48:05 +0000 |
| commit | 3705b14a4b2ac0d6baa418f08991424cfad89891 (patch) | |
| tree | e66853908357fb02deee6718a3bc0aedd3736c7a /src/rendering | |
| parent | d52bd1c709456164b167cc7389b641b690c97ee5 (diff) | |
Works on my machine
Albeit when compiled twice :)
Diffstat (limited to 'src/rendering')
| -rw-r--r-- | src/rendering/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/rendering/include/engine/rendering/rendering.h | 10 | ||||
| -rw-r--r-- | src/rendering/src/rendering.c | 2 |
3 files changed, 23 insertions, 7 deletions
diff --git a/src/rendering/CMakeLists.txt b/src/rendering/CMakeLists.txt index e04d858..f19cce0 100644 --- a/src/rendering/CMakeLists.txt +++ b/src/rendering/CMakeLists.txt @@ -3,9 +3,25 @@ add_library(daw_rendering src/rendering.c src/text.c src/window.c + ${GLAD_HEADER} ) -target_include_directories(daw_rendering PRIVATE include) +add_custom_command( + OUTPUT ${GLAD_HEADER} + COMMAND + glad + --api gl:core=4.6 + --out-path ${CMAKE_BINARY_DIR} + --reproducible + c + --header-only + --mx + ) + +set_property(SOURCE src/window.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER}) +set_property(SOURCE src/rendering.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER}) + +target_include_directories(daw_rendering PRIVATE ${DAW_INCLUDE_DIRS}) target_link_libraries(daw_rendering PRIVATE OpenGL::GL cglm diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h index ff24412..6ae6535 100644 --- a/src/rendering/include/engine/rendering/rendering.h +++ b/src/rendering/include/engine/rendering/rendering.h @@ -1,8 +1,8 @@ #ifndef RENDERING_H #define RENDERING_H -#include "types.h" -#include "vector.h" +#include <engine/core/types.h> +#include <engine/utils/vector.h> #define GLFW_INCLUDE_NONE #include <GLFW/glfw3.h> @@ -26,8 +26,8 @@ typedef struct { } Sprite; -#include "engine.h" -#include "ui.h" +#include <engine/engine.h> +#include <engine/ui.h> /* Rendering functions */ void render_begin(Window* w); @@ -52,7 +52,7 @@ void engine_draw_sprite_ex(Sprite* s, v2_i32* pos, f32 scale, Sprite sprite_new(u64 tid, u8 coord); #ifdef ENGINE_INTERNALS -#include "engine.h" +#include <engine/engine.h> //#include <glad/gl.h> //#define GLFW_INCLUDE_NONE diff --git a/src/rendering/src/rendering.c b/src/rendering/src/rendering.c index dff3432..808897c 100644 --- a/src/rendering/src/rendering.c +++ b/src/rendering/src/rendering.c @@ -9,7 +9,7 @@ #define ENGINE_INTERNALS #include <engine/engine.h> -#include <engine/rendering.h> +#include <engine/rendering/rendering.h> /* Extern globals */ extern Platform* GLOBAL_PLATFORM; |