Re-enable MJZ support.
Disabled on Windows until we can make plugins work correctly. PiperOrigin-RevId: 871214280 Change-Id: I831238704c2807e70f4347989d642a189764e53c
This commit is contained in:
committed by
Copybara-Service
parent
8024124572
commit
4ce9fb53ee
@@ -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()
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user