Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

GLMHelpers: Fix build with C++20 on GCC.

Browse source 
When enabling C++20 the lerp function seems to be redefined on GCC (not
on MSVC), don't redefine it using a CMake definition.
This commit is contained in:
Lubosz Sarnecki 2024-09-03 23:20:56 +02:00 committed by Ada
parent 9702049ede
commit 630d495230
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/shared/src/GLMHelpers.h
View file

@ -212,9 +212,11 @@ T toNormalizedDeviceScale(const T& value, const T& size) {
#define ROLL(euler) euler.z #define ROLL(euler) euler.z
// float - linear interpolate // float - linear interpolate
#if !defined(DONT_REDEFINE_LERP)
inline float lerp(float x, float y, float a) { inline float lerp(float x, float y, float a) {
return x * (1.0f - a) + (y * a); return x * (1.0f - a) + (y * a);
} }
#endif
// vec2 lerp - linear interpolate // vec2 lerp - linear interpolate
template<typename T, glm::precision P> template<typename T, glm::precision P>

3
plugins/openxr/CMakeLists.txt
View file

@ -22,6 +22,9 @@ include_hifi_library_headers(script-engine)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
# Silence GCC warnings # Silence GCC warnings
target_compile_options(openxr PRIVATE -Wno-missing-field-initializers) target_compile_options(openxr PRIVATE -Wno-missing-field-initializers)
# Fix build issue where lerp is already defined on C++20 / GCC
target_compile_definitions(openxr PRIVATE -DDONT_REDEFINE_LERP)
endif() endif()
set_property(TARGET openxr PROPERTY CXX_STANDARD 20) set_property(TARGET openxr PROPERTY CXX_STANDARD 20)