fix build (missing glut include path, #include <algorithm> for std::max in hacdICHull.cpp)

This commit is contained in:
Erwin Coumans
2014-05-13 12:59:32 -07:00
parent dc491936a2
commit 9ab755fc07
6 changed files with 17 additions and 6 deletions

View File

@@ -18,6 +18,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletXmlWorldImporter
${GLUT_INCLUDE_DIR}
)
ADD_DEFINITIONS(-DDESERIALIZE_SOFT_BODIES)

View File

@@ -16,6 +16,8 @@ IF (USE_GLUT)
../OpenGL
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
${GLUT_INCLUDE_DIR}
)
LINK_LIBRARIES(

View File

@@ -19,6 +19,8 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/HACD
${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
${GLUT_INCLUDE_DIR}
)
IF (USE_GLUT)

View File

@@ -20,6 +20,8 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src
../OpenGL
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
${GLUT_INCLUDE_DIR}
)
ADD_DEFINITIONS(-DDESERIALIZE_SOFT_BODIES)