chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #815 from limymy:main

Browse Source 
PiperOrigin-RevId: 523697282
Change-Id: I5e82268f3be861f9d187fe50dcb9d5b961b45dfd
This commit is contained in:
Copybara-Service
2023-04-12 07:45:48 -07:00
parent 34226bf52d dd32843e89
commit 814581dc59
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simulate/CMakeLists.txt
+2 -2
View File
@@ -107,7 +107,7 @@ target_sources(
PUBLIC glfw_adapter.h glfw_dispatch.h platform_ui_adapter.h
PRIVATE glfw_adapter.cc glfw_dispatch.cc platform_ui_adapter.cc
)
target_compile_options(platform_ui_adapter PUBLIC ${MUJOCO_SIMULATE_COMPILE_OPTIONS})
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)
target_link_libraries(platform_ui_adapter PUBLIC "-framework CoreVideo")
@@ -132,7 +132,7 @@ target_sources(
PRIVATE simulate.cc array_safety.h
)
target_include_directories(libsimulate PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_options(libsimulate PUBLIC ${MUJOCO_SIMULATE_COMPILE_OPTIONS})
target_compile_options(libsimulate PRIVATE ${MUJOCO_SIMULATE_COMPILE_OPTIONS})
target_link_libraries(libsimulate PUBLIC lodepng mujoco::platform_ui_adapter mujoco::mujoco)
target_link_options(libsimulate PRIVATE ${MUJOCO_SIMULATE_LINK_OPTIONS})