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
@@ -44,12 +44,18 @@ set(FILAMENT_USE_EXTERNAL_BENCHMARK ON)
|
||||
set(FILAMENT_USE_EXTERNAL_GTEST ON)
|
||||
if(WIN32)
|
||||
set(USE_STATIC_CRT OFF)
|
||||
add_compile_definitions(WIN32)
|
||||
endif()
|
||||
|
||||
set(FILAMENT_PATCH_COMMAND
|
||||
git apply --reject --whitespace=fix ${mujoco_SOURCE_DIR}/cmake/filament-allow-clang-windows.patch
|
||||
)
|
||||
|
||||
fetchpackage(
|
||||
PACKAGE_NAME filament
|
||||
GIT_REPO https://github.com/google/filament.git
|
||||
GIT_TAG ${MUJOCO_DEP_VERSION_filament}
|
||||
PATCH_COMMAND ${FILAMENT_PATCH_COMMAND}
|
||||
)
|
||||
|
||||
set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_OLD})
|
||||
|
||||
Reference in New Issue
Block a user