From 4ce9fb53eeff02a14e345787095beb58453bd927 Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Tue, 17 Feb 2026 02:50:24 -0800
Subject: [PATCH] Re-enable MJZ support.

Disabled on Windows until we can make plugins work correctly.

PiperOrigin-RevId: 871214280
Change-Id: I831238704c2807e70f4347989d642a189764e53c
---
 CMakeLists.txt                         | 1 +
 src/experimental/studio/CMakeLists.txt | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06d4bcdd..14540696 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,6 +217,7 @@ if(MUJOCO_BUILD_SIMULATE)
 endif()
 
 if(MUJOCO_BUILD_STUDIO)
+  add_subdirectory(src/experimental/mjz)
   add_subdirectory(src/experimental/platform)
   add_subdirectory(src/experimental/studio)
 endif()
diff --git a/src/experimental/studio/CMakeLists.txt b/src/experimental/studio/CMakeLists.txt
index f74fa54a..1bf9d048 100644
--- a/src/experimental/studio/CMakeLists.txt
+++ b/src/experimental/studio/CMakeLists.txt
@@ -56,6 +56,14 @@ target_link_libraries(${MUJOCO_STUDIO_TARGET_NAME}
         mujoco::platform
 )
 
+# TODO: re-enable mjz support on Windows builds once DllMain issue is resolved.
+if (NOT WIN32)
+    target_link_libraries(${MUJOCO_STUDIO_TARGET_NAME}
+        PRIVATE
+            mujoco::mjz
+    )
+endif()
+
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/assets)
 
 add_custom_command(