Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion FlingEngine/Graphics/inc/GraphicsHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<int>(res), __FILE__, __LINE__); \
assert(res == VK_SUCCESS); \
} \
}
Expand Down
2 changes: 1 addition & 1 deletion external/spdlog
Submodule spdlog updated 211 files
Loading