Skip to content

Fix to compile on UE #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix to compile on UE #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9e91cd
Fix to compile on UE
durswd Oct 5, 2025
79ef023
Fix mac build failure from spdlog CMake policy (#1084)
durswd Oct 5, 2025
27d995d
Revert "Fix mac build failure from spdlog CMake policy (#1084)"
durswd Oct 5, 2025
0d96e1f
fix
durswd Oct 5, 2025
6e5c094
Update
durswd Oct 5, 2025
15d32d1
Limit MSVC UTF-8 flag to spdlog (#1085)
durswd Oct 5, 2025
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
2 changes: 1 addition & 1 deletion Dev/Cpp/3rdParty/spdlog
Open in desktop
Submodule spdlog updated 189 files
3 changes: 3 additions & 0 deletions Dev/Cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ endif()

if(BUILD_VIEWER OR BUILD_TEST)
add_subdirectory(3rdParty/spdlog EXCLUDE_FROM_ALL)
if(MSVC AND TARGET spdlog)
target_compile_options(spdlog INTERFACE $<$<COMPILE_LANGUAGE:CXX>:/utf-8>)
endif()
list(APPEND EFK_THIRDPARTY_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/spdlog/include/)
endif()

Expand Down
2 changes: 1 addition & 1 deletion Dev/Cpp/EditorCommon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.10)

project(EditorCommon)

Expand Down
5 changes: 3 additions & 2 deletions Dev/Cpp/Effekseer/Effekseer/SIMD/Mat44f.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Mat44f.h"
#include "../Effekseer.Matrix44.h"
#include <cmath>
#include <limits>

namespace Effekseer
{
Expand Down Expand Up @@ -30,8 +31,8 @@ Mat44f::Mat44f(const Matrix44& mat)
//----------------------------------------------------------------------------------
bool Mat44f::IsValid() const
{
const Float4 nan{NAN};
const Float4 inf{INFINITY};
const Float4 nan{std::numeric_limits<float>::quiet_NaN()};
const Float4 inf{std::numeric_limits<float>::infinity()};
Float4 res = Float4::Equal(X, nan) | Float4::Equal(Y, nan) | Float4::Equal(Z, nan) | Float4::Equal(W, nan) | Float4::Equal(X, inf) |
Float4::Equal(Y, inf) | Float4::Equal(Z, inf) | Float4::Equal(W, inf);
return Float4::MoveMask(res) == 0;
Expand Down
Loading