Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compile fixes for trunk on OSX

Browse Source
This commit is contained in:
erwin.coumans
2009-05-23 01:40:27 +00:00
parent 4f92f69ca4
commit 31d3bf7700
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletDynamics/CMakeLists.txt
View File

@@ -1,6 +1,11 @@
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
SET(BulletDynamics_SRCS
ConstraintSolver/btGeneric6DofSpringConstraint.cpp
ConstraintSolver/btHinge2Constraint.cpp
ConstraintSolver/btUniversalConstraint.cpp
ConstraintSolver/btContactConstraint.cpp
ConstraintSolver/btConeTwistConstraint.cpp
ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -24,6 +29,9 @@ SET(Root_HDRS
../btBulletCollisionCommon.h
)
SET(ConstraintSolver_HDRS
ConstraintSolver/btGeneric6DofSpringConstraint.h
ConstraintSolver/btHinge2Constraint.h
ConstraintSolver/btUniversalConstraint.h
ConstraintSolver/btConstraintSolver.h
ConstraintSolver/btContactConstraint.h
ConstraintSolver/btContactSolverInfo.h

6
src/BulletMultiThreaded/btGpuDefines.h
View File

@@ -130,7 +130,7 @@ inline float4& operator*=(float4& a, float fact)
a = fact * a;
return a;
}
inline float4& operator+=(float4& a, float4& b)
inline float4& operator+=(float4& a, const float4& b)
{
a = a + b;
return a;
@@ -169,12 +169,12 @@ inline float3 operator*(const float3& a, float fact)
}
inline float3& operator+=(float3& a, float3& b)
inline float3& operator+=(float3& a, const float3& b)
{
a = a + b;
return a;
}
inline float3& operator-=(float3& a, float3& b)
inline float3& operator-=(float3& a, const float3& b)
{
a = a - b;
return a;