From b010233e7b555745bd97570aa805be7c7167165f Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 20 Jan 2010 22:46:56 +0000 Subject: [PATCH] Only use a system-wide vectormath_aos.h on CELLOS_LV2 or if USE_SYSTEM_VECTORMATH (otherwise use the included version in Bullet/src/BulletMultiThreaded/vectormath --- src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h | 7 ++++++- src/BulletMultiThreaded/vectormath2bullet.h | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h index c5b68743c..9bc2ebf51 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h @@ -24,8 +24,13 @@ subject to the following restrictions: #include -//#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" +///only use a system-wide vectormath_aos.h on CELLOS_LV2 or if USE_SYSTEM_VECTORMATH +#if defined(__CELLOS_LV2__) || defined (USE_SYSTEM_VECTORMATH) #include +#else +#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" +#endif + using namespace Vectormath::Aos; diff --git a/src/BulletMultiThreaded/vectormath2bullet.h b/src/BulletMultiThreaded/vectormath2bullet.h index efc7a3c92..5a4944a55 100644 --- a/src/BulletMultiThreaded/vectormath2bullet.h +++ b/src/BulletMultiThreaded/vectormath2bullet.h @@ -30,8 +30,13 @@ #ifndef AOS_VECTORMATH_BULLET_CONVERT_H #define AOS_VECTORMATH_BULLET_CONVERT_H + +///only use a system-wide vectormath_aos.h on CELLOS_LV2 or if USE_SYSTEM_VECTORMATH +#if defined(__CELLOS_LV2__) || defined (USE_SYSTEM_VECTORMATH) #include -//#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" +#else +#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" +#endif #include "LinearMath/btVector3.h" #include "LinearMath/btQuaternion.h"