Merge pull request #304 from traversaro:patch-5

PiperOrigin-RevId: 529843317 Change-Id: Iad4a3df7d8c61f536890f9760e441793d6d884dc
2023-05-05 16:38:02 -07:00
parent 496755a55d 2488d1c5b2
commit 26ff1fc4b5
2 changed files with 3 additions and 0 deletions
@@ -25,3 +25,4 @@ set(MUJOCO_USER_SRCS
 )

 target_sources(mujoco PRIVATE ${MUJOCO_USER_SRCS})
+target_compile_definitions(mujoco PRIVATE MUJOCO_TINYOBJLOADER_IMPL)
@@ -22,7 +22,9 @@
 #include <string>
 #include <vector>

+#ifdef MUJOCO_TINYOBJLOADER_IMPL
 #define TINYOBJLOADER_IMPLEMENTATION
+#endif

 #include <mujoco/mjmodel.h>
 #include "cc/array_safety.h"