diff --git a/CMakeLists.txt b/CMakeLists.txt index c03e6a5..b9d87a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ include(cmake/CPM.cmake) CPMAddPackage( NAME mcolor - URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-7.2.zip + URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip ) CPMAddPackage( @@ -27,7 +27,7 @@ CPMAddPackage( CPMAddPackage( NAME ReWindow - URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-32.zip + URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-34.zip ) CPMAddPackage( @@ -37,7 +37,7 @@ CPMAddPackage( CPMAddPackage( NAME jlog - URL https://git.redacted.cc/josh/jlog/Prerelease-17.zip + URL https://git.redacted.cc/josh/jlog/Prerelease-19.zip ) if (WIN32) diff --git a/src/types/Shader.cpp b/src/types/Shader.cpp index b059436..2a312c5 100644 --- a/src/types/Shader.cpp +++ b/src/types/Shader.cpp @@ -14,7 +14,7 @@ namespace JGL { bool stack_top = (already_included.size() == 0); if (stack_top) { - already_included.emplace_back(filepath); + already_included.emplace_back(filepath.string()); } std::string ret_data = ""; @@ -42,7 +42,7 @@ namespace JGL { #elif __linux__ std::replace(rel_include_path.begin(), rel_include_path.end(), '\\', '/'); #endif - std::string full_include_path = extract_path(filepath) + rel_include_path; + std::string full_include_path = extract_path(filepath.string()) + rel_include_path; // Avoid including self if (filepath == full_include_path) { @@ -117,8 +117,8 @@ namespace JGL { Shader::Shader(const std::filesystem::path& vertex_source_path, const std::filesystem::path& fragment_source_path, const std::vector>& attribute_bindings) : Shader(ReadFile(vertex_source_path), ReadFile(fragment_source_path), attribute_bindings) { - vertexPath = vertex_source_path; - fragmentPath = fragment_source_path; + vertexPath = vertex_source_path.string(); + fragmentPath = fragment_source_path.string(); } void Shader::checkCompileErrors(GLuint shader, const std::string& type) {