diff options
-rw-r--r-- | CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/llr/imm_renderer.c (renamed from src/renderer/imm_renderer.c) | 2 | ||||
-rw-r--r-- | src/llr/imm_renderer_impl.h (renamed from src/renderer/imm_renderer_impl.h) | 0 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78e5733..4b1ba6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -1,10 +1,4 @@ | |||
1 | cmake_minimum_required(VERSION 3.0) | 1 | cmake_minimum_required(VERSION 3.5) |
2 | |||
3 | set(CMAKE_C_STANDARD 23) | ||
4 | set(CMAKE_C_STANDARD_REQUIRED On) | ||
5 | set(CMAKE_C_EXTENSIONS Off) | ||
6 | |||
7 | include(cmake/shader.txt) | ||
8 | 2 | ||
9 | add_subdirectory(contrib/cgltf) | 3 | add_subdirectory(contrib/cgltf) |
10 | add_subdirectory(contrib/cgltf-tangents) | 4 | add_subdirectory(contrib/cgltf-tangents) |
@@ -14,6 +8,12 @@ add_subdirectory(app) | |||
14 | 8 | ||
15 | project(gfx) | 9 | project(gfx) |
16 | 10 | ||
11 | include(cmake/shader.txt) | ||
12 | |||
13 | set(CMAKE_C_STANDARD 23) | ||
14 | set(CMAKE_C_STANDARD_REQUIRED On) | ||
15 | set(CMAKE_C_EXTENSIONS Off) | ||
16 | |||
17 | add_shader_library(shaders | 17 | add_shader_library(shaders |
18 | shaders/brdf_integration_map.frag | 18 | shaders/brdf_integration_map.frag |
19 | shaders/cook_torrance.frag | 19 | shaders/cook_torrance.frag |
diff --git a/src/renderer/imm_renderer.c b/src/llr/imm_renderer.c index 8cf3a10..4b856c9 100644 --- a/src/renderer/imm_renderer.c +++ b/src/llr/imm_renderer.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "imm_renderer_impl.h" | 1 | #include "../renderer/imm_renderer_impl.h" |
2 | 2 | ||
3 | #include <gfx/core.h> | 3 | #include <gfx/core.h> |
4 | #include <gfx/util/shader.h> | 4 | #include <gfx/util/shader.h> |
diff --git a/src/renderer/imm_renderer_impl.h b/src/llr/imm_renderer_impl.h index 5ece354..5ece354 100644 --- a/src/renderer/imm_renderer_impl.h +++ b/src/llr/imm_renderer_impl.h | |||