trying to sort out the vectormath include path mess:

move vectormath to src folder, and add a vmInclude.h that contains the logic in a single location.
If you still need a system-wide vectormath, make sure to define USE_SYSTEM_VECTORMATH (in build system)

Demos/DX11ClothDemo/cloth_renderer.cpp

@@ -21,7 +21,7 @@
 #include "BulletSoftBody/btSoftRigidDynamicsWorld.h"
 #include "BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverVertexBuffer_DX11.h"
 #include "BulletSoftBody/btSoftBodyHelpers.h"
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
 
 class btDefaultSoftBodySolver;
 class btCPUSoftBodySolver;

src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolverData.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_SOFT_BODY_SOLVER_DATA_H
 
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
 
 
 class btSoftBodyLinkData

src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.cpp

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
 
 #include "BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.h"
 #include "BulletSoftBody/btSoftBody.h"

src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.h

@@ -16,8 +16,7 @@ subject to the following restrictions:
 #ifndef BT_ACCELERATED_SOFT_BODY_CPU_SOLVER_H
 #define BT_ACCELERATED_SOFT_BODY_CPU_SOLVER_H
 
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-
 #include "BulletSoftBody/btSoftBodySolvers.h"
 #include "BulletSoftBody/btSoftBodySolverVertexBuffer.h"
 #include "BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolverData.h"

src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.cpp

@@ -14,7 +14,7 @@ subject to the following restrictions:
 */
 
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
 
 #include "btSoftBodySolver_DX11.h"
 #include "btSoftBodySolverVertexBuffer_DX11.h"

src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolver_DX11.h

@@ -14,8 +14,7 @@ subject to the following restrictions:
 */
 
 
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-
 #include "BulletSoftBody/btSoftBodySolvers.h"
 #include "btSoftBodySolverVertexBuffer_DX11.h"
 #include "btSoftBodySolverLinkData_DX11.h"

src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.cpp

@@ -15,10 +15,7 @@ subject to the following restrictions:
 
 
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
-#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-#include "BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h"
-#include "BulletMultiThreaded/vectormath/scalar/cpp/vec_aos.h"
-
 #include "BulletSoftBody/solvers/OpenCL/btSoftBodySolver_OpenCL.h"
 #include "BulletSoftBody/VertexBuffers/btSoftBodySolverVertexBuffer.h"
 #include "BulletSoftBody/btSoftBody.h"

src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h

@@ -16,10 +16,7 @@ subject to the following restrictions:
 #ifndef BT_SOFT_BODY_SOLVER_OPENCL_H
 #define BT_SOFT_BODY_SOLVER_OPENCL_H
 
-#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-#include "BulletMultiThreaded/vectormath/scalar/cpp/mat_aos.h"
-#include "BulletMultiThreaded/vectormath/scalar/cpp/vec_aos.h"
-
 #include "BulletSoftBody/btSoftBodySolvers.h"
 #include "BulletSoftBody/solvers/OpenCL/btSoftBodySolverBuffer_OpenCL.h"
 #include "BulletSoftBody/solvers/OpenCL/btSoftBodySolverLinkData_OpenCL.h"

src/BulletMultiThreaded/PlatformDefinitions.h

@@ -5,12 +5,8 @@
 #include "LinearMath/btScalar.h"
 #include "LinearMath/btMinMax.h"
 
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-typedef Vectormath::Aos::Vector3    vmVector3;
+
-typedef Vectormath::Aos::Quat       vmQuat;
-typedef Vectormath::Aos::Matrix3    vmMatrix3;
-typedef Vectormath::Aos::Transform3 vmTransform3;
-typedef Vectormath::Aos::Point3		vmPoint3;
 
 
 

src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h

@@ -24,8 +24,7 @@ subject to the following restrictions:
 
 #include <math.h>
 
-///only use a system-wide vectormath_aos.h on CELLOS_LV2 or if USE_SYSTEM_VECTORMATH
+#include "vectormath/vmInclude.h"
-#include "vectormath_aos.h"
 #include "../PlatformDefinitions.h"
 
 

src/BulletMultiThreaded/TrbDynBody.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #ifndef __T_RB_DYN_BODY_H__
 #define __T_RB_DYN_BODY_H__
 
-#include <vectormath_aos.h>
+#include "vectormath/vmInclude.h"
 using namespace Vectormath::Aos;
 
 #include "TrbStateVec.h"

src/BulletMultiThreaded/TrbStateVec.h

@@ -18,7 +18,7 @@ subject to the following restrictions:
 #define __TRBSTATEVEC_H__
 
 #include <stdlib.h>
-#include <vectormath_aos.h>
+#include "vectormath/vmInclude.h"
 
 
 #include "PlatformDefinitions.h"

src/BulletMultiThreaded/btParallelConstraintSolver.cpp

@@ -21,8 +21,7 @@ subject to the following restrictions:
 #include "LinearMath/btQuickprof.h"
 #include "BulletMultiThreaded/btThreadSupportInterface.h"
 
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-
 
 #include "HeapManager.h"
 

src/BulletMultiThreaded/vectormath2bullet.h

@@ -31,8 +31,7 @@
 #define AOS_VECTORMATH_BULLET_CONVERT_H
 
 
-#include "vectormath_aos.h"
+#include "vectormath/vmInclude.h"
-
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btQuaternion.h"
 #include "LinearMath/btMatrix3x3.h"

src/vectormath/vmInclude.h

@@ -0,0 +1,33 @@
+
+#ifndef __VM_INCLUDE_H
+#define __VM_INCLUDE_H
+
+#include "LinearMath/btScalar.h"
+
+#if defined (USE_SYSTEM_VECTORMATH)
+	#include <vectormath_aos.h>
+#else //(USE_SYSTEM_VECTORMATH)
+	#if defined (BT_USE_SSE) && defined (_WIN32)
+		#include "sse/vectormath_aos.h"
+	#elif defined (__CELLOS_LV2__)
+		#ifdef __SPU__
+			#include "spu/vectormath_aos.h"
+		#else
+			#include "ppu/vectormath_aos.h"
+		#endif //__SPU__
+	#else //all other platforms
+		#include "scalar/vectormath_aos.h"
+	#endif //(BT_USE_SSE) && defined (_WIN32)
+#endif //(USE_SYSTEM_VECTORMATH)
+
+
+
+typedef Vectormath::Aos::Vector3    vmVector3;
+typedef Vectormath::Aos::Quat       vmQuat;
+typedef Vectormath::Aos::Matrix3    vmMatrix3;
+typedef Vectormath::Aos::Transform3 vmTransform3;
+typedef Vectormath::Aos::Point3     vmPoint3;
+
+#endif //__VM_INCLUDE_H
+
+