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(