From d7acde08c19de69383cc897fe6f0a0e22ba91b4a Mon Sep 17 00:00:00 2001 From: Jean Philippe Date: Wed, 9 Jul 2025 13:18:36 +0100 Subject: [PATCH] updated clang llvm version to v20 --- README.md | 4 ++-- ZEngine/ZEngine/Logging/Logger.cpp | 15 ++++++++++----- ZEngine/ZEngine/ZEngineDef.h | 2 +- repoConfiguration.json | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index fa5582a6..0b326e35 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Before building, make sure your setup is correct : - Install [Python](https://www.python.org/ftp/python/3.12.4/python-3.12.4-amd64.exe) - Install [CMake](https://cmake.org/download/) 3.20 or later. - Install [DOTNET SDK 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) as a VS Build Tool component (if using a standalone implementation, you might need to create a symlink between your custom installation location and the expected location: `C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Sdks\Microsoft.NET.Sdk\Sdk`) -- Install [LLVM](https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/LLVM-18.1.8-win64.exe) +- Install [LLVM](https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.7/LLVM-20.1.7-win64.exe) ### Setup macOS machine @@ -59,7 +59,7 @@ Before building, make sure your setup is correct : - Install ClangFormat through Homebrew: ```bash brew update - brew install clang-format@18 + brew install llvm@20 ``` ## Building the engine & launcher diff --git a/ZEngine/ZEngine/Logging/Logger.cpp b/ZEngine/ZEngine/Logging/Logger.cpp index f4fc2c75..65a3607d 100644 --- a/ZEngine/ZEngine/Logging/Logger.cpp +++ b/ZEngine/ZEngine/Logging/Logger.cpp @@ -66,7 +66,8 @@ namespace ZEngine::Logging auto handlers_view = handlers.view(); for (const auto& handler : handlers_view) { - handler.second(LogMessage{ + handler.second( + LogMessage{ .Color = {0.0f, 1.0f, 0.0f, 1.0f}, .Message = msg }); @@ -89,7 +90,8 @@ namespace ZEngine::Logging auto handlers_view = handlers.view(); for (const auto& handler : handlers_view) { - handler.second(LogMessage{ + handler.second( + LogMessage{ .Color = {0.5f, 0.5f, 0.5f, 1.0f}, .Message = msg }); @@ -112,7 +114,8 @@ namespace ZEngine::Logging auto handlers_view = handlers.view(); for (const auto& handler : handlers_view) { - handler.second(LogMessage{ + handler.second( + LogMessage{ .Color = {1.0f, 0.5f, 0.0f, 1.0f}, .Message = msg }); @@ -135,7 +138,8 @@ namespace ZEngine::Logging auto handlers_view = handlers.view(); for (const auto& handler : handlers_view) { - handler.second(LogMessage{ + handler.second( + LogMessage{ .Color = {1.0f, 0.0f, 0.0f, 1.0f}, .Message = msg }); @@ -158,7 +162,8 @@ namespace ZEngine::Logging auto handlers_view = handlers.view(); for (const auto& handler : handlers_view) { - handler.second(LogMessage{ + handler.second( + LogMessage{ .Color = {1.0f, 0.0f, 1.0f, 1.0f}, .Message = msg }); diff --git a/ZEngine/ZEngine/ZEngineDef.h b/ZEngine/ZEngine/ZEngineDef.h index 42fa76ed..c83b7ce3 100644 --- a/ZEngine/ZEngine/ZEngineDef.h +++ b/ZEngine/ZEngine/ZEngineDef.h @@ -28,7 +28,7 @@ if (!(condition)) \ { \ ZENGINE_CORE_CRITICAL(message) \ - assert(condition&& message); \ + assert(condition && message); \ ZENGINE_DEBUG_BREAK() \ } \ } diff --git a/repoConfiguration.json b/repoConfiguration.json index 390080bc..f0af7173 100644 --- a/repoConfiguration.json +++ b/repoConfiguration.json @@ -20,8 +20,8 @@ "Url": "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" }, "LLVM": { - "Version": "18.1.8", - "MaximumVersion": "18.2.1" + "Version": "20.1.7", + "MaximumVersion": "20.2.0" } } } \ No newline at end of file