Clean up some windows warnings on rive runtime tests Diffs= 93229eacd Clean up some windows warnings on rive runtime tests (#4198)
diff --git a/.rive_head b/.rive_head index 5e47c21..c523dbb 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -ad4ff71dfd6362883bcab2d30227d4209228f1f6 +93229eacd7a946ea27f7f3697ee5e07ddd1fe093
diff --git a/dev/test/premake5.lua b/dev/test/premake5.lua index b1a9272..30acf4a 100644 --- a/dev/test/premake5.lua +++ b/dev/test/premake5.lua
@@ -17,55 +17,26 @@ WINDOWS_CLANG_CL_SUPPRESSED_WARNINGS = { "-Wno-c++98-compat", "-Wno-c++98-compat-pedantic", - "-Wno-reserved-macro-identifier", - "-Wno-newline-eof", - "-Wno-old-style-cast", - "-Wno-unused-parameter", - "-Wno-float-equal", - "-Wno-implicit-float-conversion", - "-Wno-shadow", - "-Wno-sign-conversion", - "-Wno-inconsistent-missing-destructor-override", - "-Wno-nested-anon-types", - "-Wno-suggest-destructor-override", - "-Wno-non-virtual-dtor", - "-Wno-unknown-argument", - "-Wno-gnu-anonymous-struct", - "-Wno-extra-semi", - "-Wno-cast-qual", - "-Wno-ignored-qualifiers", - "-Wno-double-promotion", - "-Wno-tautological-unsigned-zero-compare", - "-Wno-unreachable-code-break", - "-Wno-global-constructors", - "-Wno-switch-enum", - "-Wno-shorten-64-to-32", - "-Wno-missing-prototypes", - "-Wno-implicit-int-conversion", - "-Wno-unused-macros", - "-Wno-deprecated-copy-with-user-provided-dtor", - "-Wno-missing-variable-declarations", + "-Wno-c99-extensions", "-Wno-ctad-maybe-unsupported", - "-Wno-vla-extension", - "-Wno-float-conversion", - "-Wno-gnu-zero-variadic-macro-arguments", - "-Wno-undef", + "-Wno-deprecated-copy-with-user-provided-dtor", + "-Wno-deprecated-declarations", "-Wno-documentation", "-Wno-documentation-pedantic", "-Wno-documentation-unknown-command", - "-Wno-suggest-override", - "-Wno-unused-exception-parameter", - "-Wno-cast-align", - "-Wno-deprecated-declarations", - "-Wno-shadow-field", - "-Wno-nonportable-system-include-path", - "-Wno-reserved-identifier", - "-Wno-thread-safety-negative", + "-Wno-double-promotion", "-Wno-exit-time-destructors", - "-Wno-unreachable-code", - "-Wno-zero-as-null-pointer-constant", - "-Wno-pedantic", + "-Wno-float-equal", + "-Wno-global-constructors", + "-Wno-implicit-float-conversion", + "-Wno-newline-eof", + "-Wno-old-style-cast", + "-Wno-reserved-identifier", + "-Wno-shadow", "-Wno-sign-compare", + "-Wno-sign-conversion", + "-Wno-unused-macros", + "-Wno-unused-parameter", } @@ -97,6 +68,15 @@ symbols "On" filter "system:windows" + flags { "FatalWarnings" } + removebuildoptions { + -- vs clang doesn't recognize these on windows + "-fno-exceptions", + "-fno-rtti", + } architecture "x64" - defines {"_USE_MATH_DEFINES"} + defines { + "_USE_MATH_DEFINES", + "_CRT_SECURE_NO_WARNINGS" + } buildoptions {WINDOWS_CLANG_CL_SUPPRESSED_WARNINGS}
diff --git a/src/shapes/path.cpp b/src/shapes/path.cpp index 0080809..6ef2c0f 100644 --- a/src/shapes/path.cpp +++ b/src/shapes/path.cpp
@@ -307,6 +307,7 @@ deletePrevious = true; break; } + [[fallthrough]]; } default: if (deletePrevious) { @@ -353,4 +354,4 @@ } } -#endif \ No newline at end of file +#endif
diff --git a/test/instancing_test.cpp b/test/instancing_test.cpp index e500c6b..d182928 100644 --- a/test/instancing_test.cpp +++ b/test/instancing_test.cpp
@@ -58,7 +58,7 @@ // Make sure no animations were deleted by deleting the instance. REQUIRE(rive::LinearAnimation::deleteCount == 0); - int numberOfAnimations = file->artboard()->animationCount(); + size_t numberOfAnimations = file->artboard()->animationCount(); file.reset(nullptr); // Now the animations should've been deleted. REQUIRE(rive::LinearAnimation::deleteCount == numberOfAnimations);