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

Only use a system-wide vectormath_aos.h on CELLOS_LV2 or if USE_SYSTEM_VECTORMATH

Browse Source 
(otherwise use the included version in Bullet/src/BulletMultiThreaded/vectormath
This commit is contained in:
erwin.coumans
2010-01-20 22:46:56 +00:00
parent 01351ff76f
commit b010233e7b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h
View File

@@ -24,8 +24,13 @@ subject to the following restrictions:
#include <math.h>
//#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 <vectormath_aos.h>
#else
#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h"
#endif
using namespace Vectormath::Aos;

7
src/BulletMultiThreaded/vectormath2bullet.h
View File

@@ -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 <vectormath_aos.h>
//#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"