fix some compatibility issues between Bullet / PE / vectormath, introduced a few commits ago

src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

@@ -19,7 +19,7 @@ subject to the following restrictions:
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransformUtil.h"
 
-#if 1 //#ifdef PFX_USE_FREE_VECTORMATH
+#ifdef PFX_USE_FREE_VECTORMATH
 	#include "physics_effects\base_level\solver\pfx_constraint_row.h"
 typedef sce::PhysicsEffects::PfxConstraintRow btConstraintRow;
 #else

src/BulletMultiThreaded/PlatformDefinitions.h

@@ -5,7 +5,11 @@
 #include "LinearMath/btScalar.h"
 #include "LinearMath/btMinMax.h"
 
+#ifdef PFX_USE_FREE_VECTORMATH
 #include "vecmath/vmInclude.h"
+#else
+#include "vectormath/vmInclude.h"
+#endif//PFX_USE_FREE_VECTORMATH
 
 
 
@@ -27,9 +31,11 @@ typedef union
 
 		typedef unsigned char     uint8_t;
 #ifndef __PHYSICS_COMMON_H__
+#ifndef PFX_USE_FREE_VECTORMATH
 #ifndef __BT_SKIP_UINT64_H
 		typedef unsigned long int uint64_t;
 #endif //__BT_SKIP_UINT64_H
+#endif //PFX_USE_FREE_VECTORMATH
 		typedef unsigned int      uint32_t;
 #endif //__PHYSICS_COMMON_H__
 		typedef unsigned short    uint16_t;

src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h

@@ -24,7 +24,7 @@ subject to the following restrictions:
 
 #include <math.h>
 
-#include "vecmath/vmInclude.h"
+
 #include "../PlatformDefinitions.h"
 
 

src/BulletMultiThreaded/TrbStateVec.h

@@ -18,7 +18,11 @@ subject to the following restrictions:
 #define __TRBSTATEVEC_H__
 
 #include <stdlib.h>
+#ifdef PFX_USE_FREE_VECTORMATH
 #include "vecmath/vmInclude.h"
+#else
+#include "vectormath/vmInclude.h"
+#endif //PFX_USE_FREE_VECTORMATH
 
 
 #include "PlatformDefinitions.h"

src/BulletMultiThreaded/btParallelConstraintSolver.cpp

@@ -20,8 +20,11 @@ subject to the following restrictions:
 
 #include "LinearMath/btQuickprof.h"
 #include "BulletMultiThreaded/btThreadSupportInterface.h"
-
+#ifdef PFX_USE_FREE_VECTORMATH
 #include "vecmath/vmInclude.h"
+#else
+#include "vectormath/vmInclude.h"
+#endif //PFX_USE_FREE_VECTORMATH
 
 #include "HeapManager.h"
 

src/BulletMultiThreaded/vectormath2bullet.h

@@ -30,8 +30,11 @@
 #ifndef AOS_VECTORMATH_BULLET_CONVERT_H
 #define AOS_VECTORMATH_BULLET_CONVERT_H
 
-
+#ifdef PFX_USE_FREE_VECTORMATH
 #include "vecmath/vmInclude.h"
+#else
+#include "vectormath/vmInclude.h"
+#endif //PFX_USE_FREE_VECTORMATH
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btQuaternion.h"
 #include "LinearMath/btMatrix3x3.h"