Enable MuJoCo Studio build and packaging on Windows.
Also: - Patched Filament to support building with Clang, so the default MuJoCo build mode doesn't need to change. This should probably be upstreamed. - Added missing Windows deps to MuJoCo Platform CMake config. - Updated Studio CMake config to fix unresolved symbols issues on Windows. PiperOrigin-RevId: 934612701 Change-Id: I3a34a5d274e1452c9cfef0e2868f2788b4b0c7e8
This commit is contained in:
committed by
Copybara-Service
parent
e7ef6528b7
commit
492585ca7a
@@ -17,26 +17,26 @@ if(NOT TARGET mujoco::platform)
|
||||
return()
|
||||
endif()
|
||||
|
||||
set(STUDIO_COMMON_LIBS
|
||||
mujoco::platform
|
||||
structs_header
|
||||
structs_wrappers
|
||||
)
|
||||
|
||||
mujoco_pybind11_module(parser parser.cc)
|
||||
target_link_libraries(parser PRIVATE mujoco::platform structs_header structs_wrappers)
|
||||
target_link_libraries(parser PRIVATE ${STUDIO_COMMON_LIBS})
|
||||
|
||||
mujoco_pybind11_module(native_viewer_cc native_viewer.cc)
|
||||
target_link_libraries(native_viewer_cc PRIVATE
|
||||
mujoco::platform
|
||||
structs_header
|
||||
)
|
||||
target_link_libraries(native_viewer_cc PRIVATE ${STUDIO_COMMON_LIBS})
|
||||
|
||||
mujoco_pybind11_module(renderer renderer.cc)
|
||||
target_link_libraries(renderer PRIVATE mujoco::platform structs_header)
|
||||
target_link_libraries(renderer PRIVATE ${STUDIO_COMMON_LIBS})
|
||||
|
||||
mujoco_pybind11_module(ux ux.cc)
|
||||
target_link_libraries(ux PRIVATE
|
||||
mujoco::platform
|
||||
structs_header
|
||||
)
|
||||
target_link_libraries(ux PRIVATE ${STUDIO_COMMON_LIBS})
|
||||
|
||||
mujoco_pybind11_module(sim sim.cc)
|
||||
target_link_libraries(sim PRIVATE mujoco::platform structs_header)
|
||||
target_link_libraries(sim PRIVATE ${STUDIO_COMMON_LIBS})
|
||||
|
||||
set(MUJOCO_STUDIO_TARGETS
|
||||
parser
|
||||
|
||||
Reference in New Issue
Block a user