diff --git a/cmake/filament-allow-clang-windows.patch b/cmake/filament-allow-clang-windows.patch index 54b8ff57..e4fb9417 100644 --- a/cmake/filament-allow-clang-windows.patch +++ b/cmake/filament-allow-clang-windows.patch @@ -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) + diff --git a/cmake/third_party_deps/dear_imgui.cmake b/cmake/third_party_deps/dear_imgui.cmake index 6eb32e50..45046f3a 100644 --- a/cmake/third_party_deps/dear_imgui.cmake +++ b/cmake/third_party_deps/dear_imgui.cmake @@ -13,7 +13,7 @@ # limitations under the License. set(MUJOCO_DEP_VERSION_dear_imgui - 3109131a882daec56a530aff540416983c240443 + 913a3c60561bb07e8fd410ec7d4a8f6f485defd6 CACHE STRING "Tag/version of `dear_imgui` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_dear_imgui) diff --git a/cmake/third_party_deps/filament.cmake b/cmake/third_party_deps/filament.cmake index ce293ada..afbf961a 100644 --- a/cmake/third_party_deps/filament.cmake +++ b/cmake/third_party_deps/filament.cmake @@ -13,7 +13,7 @@ # limitations under the License. set(MUJOCO_DEP_VERSION_filament - da22932b543b59810caf490d7f9e8859ec3fe204 + 10d2fc35128c2bc41ec4a1913c288d5df24afdaf CACHE STRING "Tag/version of `filament` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_filament) diff --git a/cmake/third_party_deps/implot.cmake b/cmake/third_party_deps/implot.cmake index 6bd75fef..d14cae6c 100644 --- a/cmake/third_party_deps/implot.cmake +++ b/cmake/third_party_deps/implot.cmake @@ -13,7 +13,7 @@ # limitations under the License. set(MUJOCO_DEP_VERSION_implot - 0d4d87c3e005349c1aeb7ceacfd20a67f23c42b8 + ec7306ceb99d19ff193eb30dc74fa3598f5e7dc6 CACHE STRING "Tag/version of `implot` to be fetched." ) mark_as_advanced(MUJOCO_DEP_VERSION_implot)