fix build most recent emscripten build

google · Sep 21, 2023 · 9223f58 · 9223f58
1 parent ea70fe5
commit 9223f58
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -171,27 +171,29 @@ typedef details::TQuaternion<double> quat;
 typedef details::TQuaternion<float> quatf;
 typedef details::TQuaternion<half> 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) };
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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