From e3678118b45bb874eda16bf563b1b08d856159b9 Mon Sep 17 00:00:00 2001 From: Erris Date: Tue, 10 Mar 2026 14:47:54 +0100 Subject: [PATCH] trying to get everything to work --- conanfile.txt | 1 + editor/CMakeLists.txt | 2 +- open_engine/CMakeLists.txt | 3 ++- open_engine/include/open_engine/pch.hpp | 3 ++- open_engine/include/open_engine/renderer/shader.hpp | 1 + open_engine/src/open_engine/opengl/opengl_shader.cpp | 4 +--- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index eb0f7bf..3afc4f8 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -7,6 +7,7 @@ joltphysics/5.2.0 fastgltf/0.9.0 glm/1.0.1 glfw/3.4 +shaderc/2025.3 [generators] CMakeDeps diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index eaee8e0..3da693a 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -25,7 +25,7 @@ target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/include/freetype2/" ) -target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.linux-x64/10.0.3/runtimes/linux-x64/native") +target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/") #target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/libnethost.a") target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE diff --git a/open_engine/CMakeLists.txt b/open_engine/CMakeLists.txt index 19dadbd..38817aa 100644 --- a/open_engine/CMakeLists.txt +++ b/open_engine/CMakeLists.txt @@ -18,6 +18,7 @@ find_package(fastgltf REQUIRED) find_package(spdlog REQUIRED) find_package(glm REQUIRED) find_package(glfw3 REQUIRED) +find_package(shaderc REQUIRED) file(GLOB_RECURSE SRC_FILES "src/*.cpp") file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp") @@ -57,7 +58,7 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC X11 yaml-cpp::yaml-cpp nfd - shaderc_combined + shaderc::shaderc glslang glslang-default-resource-limits SPIRV diff --git a/open_engine/include/open_engine/pch.hpp b/open_engine/include/open_engine/pch.hpp index 5708cfd..0ab38d7 100644 --- a/open_engine/include/open_engine/pch.hpp +++ b/open_engine/include/open_engine/pch.hpp @@ -1,7 +1,8 @@ #ifndef PCH_HPP #define PCH_HPP -#include "open_engine/logging.hpp" +#include +#include #include diff --git a/open_engine/include/open_engine/renderer/shader.hpp b/open_engine/include/open_engine/renderer/shader.hpp index 7464e33..14ec7a6 100644 --- a/open_engine/include/open_engine/renderer/shader.hpp +++ b/open_engine/include/open_engine/renderer/shader.hpp @@ -2,6 +2,7 @@ #define SHADER_HPP #include + #include #include diff --git a/open_engine/src/open_engine/opengl/opengl_shader.cpp b/open_engine/src/open_engine/opengl/opengl_shader.cpp index 07b07f5..5865f90 100644 --- a/open_engine/src/open_engine/opengl/opengl_shader.cpp +++ b/open_engine/src/open_engine/opengl/opengl_shader.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include @@ -13,7 +12,6 @@ #include #include #include -//#include namespace OpenEngine { @@ -30,7 +28,7 @@ namespace OpenEngine { return 0; } - static shaderc_shader_kind GLShaderStageToShaderC(GLenum stage) + static ::shaderc_shader_kind GLShaderStageToShaderC(GLenum stage) { switch (stage) {