Merge main branch from mujoco
This commit is contained in:
@@ -29,7 +29,7 @@ set(MUJOCO_DEP_VERSION_lodepng
|
||||
|
||||
project(
|
||||
mujoco_simulate
|
||||
VERSION 3.3.1
|
||||
VERSION 3.3.3
|
||||
DESCRIPTION "MuJoCo simulate binaries"
|
||||
HOMEPAGE_URL "https://mujoco.org"
|
||||
)
|
||||
@@ -114,6 +114,7 @@ target_sources(
|
||||
target_compile_options(platform_ui_adapter PRIVATE ${MUJOCO_SIMULATE_COMPILE_OPTIONS})
|
||||
if(APPLE)
|
||||
target_sources(platform_ui_adapter PUBLIC glfw_corevideo.h PRIVATE glfw_corevideo.mm)
|
||||
set_source_files_properties(glfw_corevideo.mm PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
|
||||
target_link_libraries(platform_ui_adapter PUBLIC "-framework CoreVideo")
|
||||
endif()
|
||||
target_include_directories(
|
||||
|
||||
Reference in New Issue
Block a user