From 9223f581980fb2b0ca8fa893d8a6a6faf36d4a0a Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 21 Sep 2023 11:40:06 -0700 Subject: [PATCH] fix build most recent emscripten build --- NEW_RELEASE_NOTES.md | 1 + filament/CMakeLists.txt | 2 +- filament/backend/CMakeLists.txt | 2 +- libs/math/include/math/quat.h | 14 ++++++++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md index c724a4e4ef7..d091003d8c8 100644 --- a/NEW_RELEASE_NOTES.md +++ b/NEW_RELEASE_NOTES.md @@ -10,3 +10,4 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md). - engine: remove `BloomOptions::anamorphism` which wasn't working well in most cases [**API CHANGE**] - engine: new API to return a Material's supported variants, C++ only (b/297456590) +- build: fix emscripten-1.3.46 build diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt index e417eb06dc8..b65e3cca9ba 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt @@ -557,7 +557,7 @@ if (MSVC) set(FILAMENT_WARNINGS /W3) else() set(FILAMENT_WARNINGS - -Wall -Wextra -Wno-unused-parameter + -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef -Wgnu-conditional-omitted-operand -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt index 3d35d38d22a..2627f6a13b2 100644 --- a/filament/backend/CMakeLists.txt +++ b/filament/backend/CMakeLists.txt @@ -355,7 +355,7 @@ if (MSVC) set(FILAMENT_WARNINGS /W3) else() set(FILAMENT_WARNINGS - -Wall -Wextra -Wno-unused-parameter + -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wextra-semi -Wnewline-eof -Wdeprecated -Wundef -Wgnu-conditional-omitted-operand -Wweak-vtables -Wnon-virtual-dtor -Wclass-varargs -Wimplicit-fallthrough diff --git a/libs/math/include/math/quat.h b/libs/math/include/math/quat.h index a51a4eb2379..af9f7467fb4 100644 --- a/libs/math/include/math/quat.h +++ b/libs/math/include/math/quat.h @@ -171,27 +171,29 @@ typedef details::TQuaternion quat; typedef details::TQuaternion quatf; typedef details::TQuaternion quath; -constexpr inline quat operator "" _i(long double v) { +// note: don't put a space between "" and _{i,j,k}, this is deprecated + +constexpr inline quat operator ""_i(long double v) { return { 0.0, double(v), 0.0, 0.0 }; } -constexpr inline quat operator "" _j(long double v) { +constexpr inline quat operator ""_j(long double v) { return { 0.0, 0.0, double(v), 0.0 }; } -constexpr inline quat operator "" _k(long double v) { +constexpr inline quat operator ""_k(long double v) { return { 0.0, 0.0, 0.0, double(v) }; } -constexpr inline quat operator "" _i(unsigned long long v) { +constexpr inline quat operator ""_i(unsigned long long v) { return { 0.0, double(v), 0.0, 0.0 }; } -constexpr inline quat operator "" _j(unsigned long long v) { +constexpr inline quat operator ""_j(unsigned long long v) { return { 0.0, 0.0, double(v), 0.0 }; } -constexpr inline quat operator "" _k(unsigned long long v) { +constexpr inline quat operator ""_k(unsigned long long v) { return { 0.0, 0.0, 0.0, double(v) }; }