diff --git a/CMakeLists.txt b/CMakeLists.txt index fe3bd865..d8d51d88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,11 @@ if( MSVC ) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") endif() + + # spdlog 1.17+ bundles fmt v12, which requires UTF-8 source encoding on MSVC. + # See https://github.com/fmtlib/fmt/pull/4159 + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8") # GCC elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") diff --git a/FlingEngine/Graphics/inc/GraphicsHelpers.h b/FlingEngine/Graphics/inc/GraphicsHelpers.h index 38eee371..caadae1c 100644 --- a/FlingEngine/Graphics/inc/GraphicsHelpers.h +++ b/FlingEngine/Graphics/inc/GraphicsHelpers.h @@ -11,7 +11,7 @@ VkResult res = (f); \ if (res != VK_SUCCESS) \ { \ - F_LOG_ERROR("VkResult is {} in {} at line {}", res, __FILE__, __LINE__); \ + F_LOG_ERROR("VkResult is {} in {} at line {}", static_cast(res), __FILE__, __LINE__); \ assert(res == VK_SUCCESS); \ } \ } diff --git a/external/spdlog b/external/spdlog index a7148b71..79524ddd 160000 --- a/external/spdlog +++ b/external/spdlog @@ -1 +1 @@ -Subproject commit a7148b718ea2fabb8387cb90aee9bf448da63e65 +Subproject commit 79524ddd08a4ec981b7fea76afd08ee05f83755d