diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-03-02 21:13:36 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-03-02 21:15:39 +0000 |
| commit | 600f3992dea14ea6d505f5bf07d943a7ee24c7be (patch) | |
| tree | 714cb73cb8a1ebd9e5a2dfed0593d12fb721390b | |
| parent | 591c473dda71c51c5e2a96e8f2a70a9e296a4444 (diff) | |
Fix compilation order
| -rw-r--r-- | src/core/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/resources/include/engine/resources/model.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 82ccfdd..d67016b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -8,9 +8,10 @@ add_library(daw_core src/memory.c src/state.c src/thread.c + ${GLAD_HEADER} ) -set_property(SOURCE src/loop.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER}) +#set_property(SOURCE src/loop.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER}) target_include_directories(daw_core PRIVATE ${DAW_INCLUDE_DIRS}) target_link_libraries(daw_core PRIVATE cglm) diff --git a/src/resources/include/engine/resources/model.h b/src/resources/include/engine/resources/model.h index d22dc21..c608729 100644 --- a/src/resources/include/engine/resources/model.h +++ b/src/resources/include/engine/resources/model.h @@ -7,7 +7,6 @@ extern "C" { #include <engine/core/types.h> #include <cglm/cglm.h> -#include <glad/gl.h> typedef enum { Model_error, @@ -17,9 +16,9 @@ typedef enum { typedef struct { ModelType format; - GLuint m_uiVAO; - GLuint m_uiVBO; - GLuint m_uiIBO; + u32 m_uiVAO; + u32 m_uiVBO; + u32 m_uiIBO; unsigned m_uiNumIndices; } Model; |