diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/resources/include/engine/resources.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt index 7549c2f..0c14524 100644 --- a/src/resources/CMakeLists.txt +++ b/src/resources/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(daw_resources ) target_include_directories(daw_resources PRIVATE ${DAW_INCLUDE_DIRS}) -target_link_libraries( - daw_resources +target_link_libraries(daw_resources PRIVATE assimp + cglm ) diff --git a/src/resources/include/engine/resources.h b/src/resources/include/engine/resources.h index 2659ed9..e151d7e 100644 --- a/src/resources/include/engine/resources.h +++ b/src/resources/include/engine/resources.h @@ -1,7 +1,8 @@ -#ifndef RESOURCES_H -#define RESOURCES_H +#ifndef ENGINE_RESOURCES_H +#define ENGINE_RESOURCES_H #include <engine/core/types.h> +#include <engine/rendering/rendering.h> // TODO /* We need some "global resources", available to all states. @@ -51,7 +52,7 @@ typedef union { } asset_t; // The resource spec -struct Resources { +typedef struct { // Was: // usize textures_len; // usize textures_size; @@ -73,7 +74,7 @@ struct Resources { // asset_t assets*; Shader* shaders; usize shaders_len; -}; +} Resources; #define Resource_FontDefinition(_path, _fontsize) \ (const Asset_FontSpec) { \ |