From 482a5a05920de27e028a4a38f50360069ccc917e Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Tue, 2 Jan 2024 10:35:20 +0100
Subject: [PATCH] Update for latest nazarautils

---
 include/NZSL/Math/Vector.hpp                                  | 2 +-
 include/NZSL/Math/Vector.inl                                  | 1 -
 src/NZSL/Ast/ConstantPropagationVisitor_BinaryArithmetics.cpp | 2 +-
 src/NZSL/Ast/ConstantPropagationVisitor_BinaryComparison.cpp  | 2 +-
 src/NZSL/FilesystemModuleResolver.cpp                         | 2 +-
 src/NZSL/GlslWriter.cpp                                       | 1 +
 src/NZSL/Parser.cpp                                           | 2 +-
 src/NZSL/SpirvWriter.cpp                                      | 1 +
 src/ShaderCompiler/Compiler.cpp                               | 1 +
 xmake.lua                                                     | 2 +-
 10 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/NZSL/Math/Vector.hpp b/include/NZSL/Math/Vector.hpp
index 68a582b..bc3c087 100644
--- 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
index 6c66893..99c193f 100644
--- 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
index aee107d..194c321 100644
--- 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
index 2385da5..e59564a 100644
--- 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
index a1b0d71..b645896 100644
--- 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
index b25fe04..e05ac46 100644
--- 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
index aabf348..1e500c9 100644
--- 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
index 004a097..c7adb80 100644
--- 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
index 4cc19ff..e9591e8 100644
--- 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
index f4fc8e6..7d08460 100644
--- 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")