diff --git a/include/Nazara/Core/ByteArrayPool.inl b/include/Nazara/Core/ByteArrayPool.inl index e5b106b94..5c84e2a79 100644 --- a/include/Nazara/Core/ByteArrayPool.inl +++ b/include/Nazara/Core/ByteArrayPool.inl @@ -9,7 +9,7 @@ namespace Nz { namespace Detail { - bool SortByteArrayByCapacity(const ByteArray& byteArray, std::size_t refCapacity) + inline bool SortByteArrayByCapacity(const ByteArray& byteArray, std::size_t refCapacity) { return refCapacity > byteArray.GetCapacity(); } diff --git a/src/Nazara/Core/ParameterList.cpp b/src/Nazara/Core/ParameterList.cpp index 3da5cbf8e..41ac424c4 100644 --- a/src/Nazara/Core/ParameterList.cpp +++ b/src/Nazara/Core/ParameterList.cpp @@ -641,7 +641,7 @@ namespace Nz ss << "Boolean(" << parameter.value.boolVal << ")"; break; case ParameterType::Color: - ss << "Color(" << parameter.value.colorVal << ")"; + ss << "Color(" << parameter.value.colorVal.ToString() << ")"; break; case ParameterType::Double: ss << "Double(" << parameter.value.doubleVal << ")"; diff --git a/tests/xmake.lua b/tests/xmake.lua index 6710b325c..1daab3e2d 100644 --- a/tests/xmake.lua +++ b/tests/xmake.lua @@ -18,7 +18,7 @@ if has_config("tests") then set_kind("binary") add_deps("NazaraCore", "NazaraNetwork", "NazaraPhysics2D", "NazaraShader") - add_packages("catch2", "glslang", "spirv-tools") + add_packages("catch2", "entt", "glslang", "spirv-tools") add_headerfiles("Engine/**.hpp") add_files("resources.cpp") add_files("Engine/**.cpp")