chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies ahead of the 3.11.0 release.

Browse Source 
PiperOrigin-RevId: 951974346
Change-Id: Ie2b7a357442705e7d37d824463f7feb120a212e7
This commit is contained in:
Michael Moss
2026-07-22 02:12:15 -07:00
committed by Copybara-Service
parent e0224c6440
commit 782c00bc49
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/filament-allow-clang-windows.patch
+13
View File
@@ -504,3 +504,16 @@ diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
+
if (APPLE)
diff --git a/libs/utils/include/utils/compiler.h b/libs/utils/include/utils/compiler.h
--- a/libs/utils/include/utils/compiler.h
+++ b/libs/utils/include/utils/compiler.h
@@ -227,7 +227,7 @@
// AND multi-threading is enabled (UTILS_HAS_THREADING is not 0).
// This prevents compile failures on single-threaded targets or builds where standard
// annotations are disabled by default in the platform's standard library headers.
-#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) && UTILS_HAS_THREADING
+#if defined(_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS) && UTILS_HAS_THREADING && !defined(_WIN32)
#define UTILS_THREAD_ANNOTATION_ATTRIBUTE(x) __attribute__((x))
#else
#define UTILS_THREAD_ANNOTATION_ATTRIBUTE(x)