Update for latest nazarautils

NazaraEngine · Jan 2, 2024 · 482a5a0 · 482a5a0
1 parent a84faad
commit 482a5a0
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 7 deletions.
diff --git a/include/NZSL/Math/Vector.hpp b/include/NZSL/Math/Vector.hpp
@@ -7,7 +7,7 @@
 #ifndef NZSL_MATH_VECTOR_HPP
 #define NZSL_MATH_VECTOR_HPP
 
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/MathUtils.hpp>
 #include <NZSL/Config.hpp>
 #include <array>
 #include <functional>

diff --git a/include/NZSL/Math/Vector.inl b/include/NZSL/Math/Vector.inl
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <NazaraUtils/Hash.hpp>
-#include <cmath>
 
 namespace nzsl
 {

diff --git a/src/NZSL/Ast/ConstantPropagationVisitor_BinaryArithmetics.cpp b/src/NZSL/Ast/ConstantPropagationVisitor_BinaryArithmetics.cpp
@@ -2,9 +2,9 @@
 // This file is part of the "Nazara Shading Language" project
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <NZSL/Ast/ConstantPropagationVisitor.hpp>
 #include <NazaraUtils/Algorithm.hpp>
 #include <NZSL/ShaderBuilder.hpp>
+#include <NZSL/Ast/ConstantPropagationVisitor.hpp>
 #include <NZSL/Lang/Errors.hpp>
 #include <cassert>
 #include <cmath>

diff --git a/src/NZSL/Ast/ConstantPropagationVisitor_BinaryComparison.cpp b/src/NZSL/Ast/ConstantPropagationVisitor_BinaryComparison.cpp
@@ -2,8 +2,8 @@
 // This file is part of the "Nazara Shading Language" project
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <NZSL/ShaderBuilder.hpp>
 #include <NZSL/Ast/ConstantPropagationVisitor.hpp>
+#include <NZSL/ShaderBuilder.hpp>
 #include <NZSL/Lang/Errors.hpp>
 #include <cassert>
 #include <cmath>

diff --git a/src/NZSL/FilesystemModuleResolver.cpp b/src/NZSL/FilesystemModuleResolver.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <NZSL/FilesystemModuleResolver.hpp>
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <NZSL/Parser.hpp>
 #include <NZSL/Ast/AstSerializer.hpp>
 #ifdef NZSL_EFSW

diff --git a/src/NZSL/GlslWriter.cpp b/src/NZSL/GlslWriter.cpp
@@ -6,6 +6,7 @@
 #include <NazaraUtils/Algorithm.hpp>
 #include <NazaraUtils/Bitset.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <NZSL/Enums.hpp>
 #include <NZSL/ShaderBuilder.hpp>
 #include <NZSL/Ast/Cloner.hpp>

diff --git a/src/NZSL/Parser.cpp b/src/NZSL/Parser.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <NZSL/Parser.hpp>
-#include <NazaraUtils/Algorithm.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <NZSL/ShaderBuilder.hpp>
 #include <NZSL/Lang/Errors.hpp>
 #include <NZSL/Lang/LangData.hpp>

diff --git a/src/NZSL/SpirvWriter.cpp b/src/NZSL/SpirvWriter.cpp
@@ -4,6 +4,7 @@
 
 #include <NZSL/SpirvWriter.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <NazaraUtils/StackVector.hpp>
 #include <NZSL/Enums.hpp>
 #include <NZSL/Parser.hpp>

diff --git a/src/ShaderCompiler/Compiler.cpp b/src/ShaderCompiler/Compiler.cpp
@@ -5,6 +5,7 @@
 #include <ShaderCompiler/Compiler.hpp>
 #include <NazaraUtils/Algorithm.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
+#include <NazaraUtils/PathUtils.hpp>
 #include <NZSL/FilesystemModuleResolver.hpp>
 #include <NZSL/GlslWriter.hpp>
 #include <NZSL/LangWriter.hpp>

diff --git a/xmake.lua b/xmake.lua
@@ -27,7 +27,7 @@ end
 
 add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
 add_requires("fmt", { configs = { header_only = true }, system = false })
-add_requires("nazarautils >=2023.12.28", "fast_float", "frozen", "ordered_map")
+add_requires("nazarautils >=2024.01.02", "fast_float", "frozen", "ordered_map")
 
 if has_config("fs_watcher") then
 	add_requires("efsw")