Do not define TINYOBJLOADER_IMPLEMENTATION when building with CMake
This commit is contained in:
committed by
Silvio
parent
c7960385be
commit
2488d1c5b2
@@ -25,3 +25,4 @@ set(MUJOCO_USER_SRCS
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_sources(mujoco PRIVATE ${MUJOCO_USER_SRCS})
|
target_sources(mujoco PRIVATE ${MUJOCO_USER_SRCS})
|
||||||
|
target_compile_definitions(mujoco PRIVATE MUJOCO_DO_NOT_DEFINE_TINYOBJLOADER_IMPLEMENTATION)
|
||||||
|
|||||||
@@ -25,7 +25,11 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
// This macro is defined when MuJoCo is built with CMake,
|
||||||
|
// not defined when MuJoCo is built with other build systems
|
||||||
|
#ifndef MUJOCO_DO_NOT_DEFINE_TINYOBJLOADER_IMPLEMENTATION
|
||||||
#define TINYOBJLOADER_IMPLEMENTATION
|
#define TINYOBJLOADER_IMPLEMENTATION
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <mujoco/mjmodel.h>
|
#include <mujoco/mjmodel.h>
|
||||||
#include "cc/array_safety.h"
|
#include "cc/array_safety.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user