From b7211240fc3bb1d9761dc413363139a73bf65b18 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Mon, 28 Feb 2011 07:27:39 +0000
Subject: [PATCH] more compatibility fixes for Physics Effects 2.x/vectormath.

---
 src/BulletMultiThreaded/PlatformDefinitions.h | 7 ++++++-
 src/BulletMultiThreaded/vectormath2bullet.h   | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/BulletMultiThreaded/PlatformDefinitions.h b/src/BulletMultiThreaded/PlatformDefinitions.h
index 393d4cb57..2ecd9dce3 100644
--- a/src/BulletMultiThreaded/PlatformDefinitions.h
+++ b/src/BulletMultiThreaded/PlatformDefinitions.h
@@ -6,7 +6,12 @@
 #include "LinearMath/btMinMax.h"
 
 #ifdef PFX_USE_FREE_VECTORMATH
-#include "vecmath/vmInclude.h"
+#include "physics_effects/base_level/base/pfx_vectormath_include.win32.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;
 #else
 #include "vectormath/vmInclude.h"
 #endif//PFX_USE_FREE_VECTORMATH
diff --git a/src/BulletMultiThreaded/vectormath2bullet.h b/src/BulletMultiThreaded/vectormath2bullet.h
index 1fe08bd88..56a4186e4 100644
--- a/src/BulletMultiThreaded/vectormath2bullet.h
+++ b/src/BulletMultiThreaded/vectormath2bullet.h
@@ -30,11 +30,7 @@
 #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 "PlatformDefinitions.h"
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btQuaternion.h"
 #include "LinearMath/btMatrix3x3.h"