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

Re-enable MJZ support.

Browse Source 
Disabled on Windows until we can make plugins work correctly.

PiperOrigin-RevId: 871214280
Change-Id: I831238704c2807e70f4347989d642a189764e53c
This commit is contained in:
Haroon Qureshi
2026-02-17 02:50:24 -08:00
committed by Copybara-Service
parent 8024124572
commit 4ce9fb53ee
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -217,6 +217,7 @@ if(MUJOCO_BUILD_SIMULATE)
endif() endif()
if(MUJOCO_BUILD_STUDIO) if(MUJOCO_BUILD_STUDIO)
add_subdirectory(src/experimental/mjz)
add_subdirectory(src/experimental/platform) add_subdirectory(src/experimental/platform)
add_subdirectory(src/experimental/studio) add_subdirectory(src/experimental/studio)
endif() endif()
src/experimental/studio/CMakeLists.txt
+8
View File
@@ -56,6 +56,14 @@ target_link_libraries(${MUJOCO_STUDIO_TARGET_NAME}
mujoco::platform 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) file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/assets)
add_custom_command( add_custom_command(