From df550730da5190d91659b0909e2449fb80f5c110 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 7 Sep 2009 17:42:12 +0000 Subject: [PATCH] include relative full path for vectormath_aos.h, and fix minor typo in glut.h --- Glut/GL/glut.h | 1 - src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h | 3 ++- src/BulletMultiThreaded/vectormath2bullet.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Glut/GL/glut.h b/Glut/GL/glut.h index 5464ede6e..612f33272 100644 --- a/Glut/GL/glut.h +++ b/Glut/GL/glut.h @@ -58,7 +58,6 @@ typedef unsigned short int wchar_t; #else #pragma message("Note: including lib: glut32.lib\n") #pragma comment (lib, "glut32.lib") /* link with Win32 GLUT lib */ -asb #endif #pragma warning (disable:4244) /* Disable bogus conversion warnings. */ diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h index b63572340..63fdfebc9 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/Box.h @@ -23,7 +23,8 @@ subject to the following restrictions: #endif #include -#include +#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" +// using namespace Vectormath::Aos; diff --git a/src/BulletMultiThreaded/vectormath2bullet.h b/src/BulletMultiThreaded/vectormath2bullet.h index 737095e9c..e75af5b11 100644 --- a/src/BulletMultiThreaded/vectormath2bullet.h +++ b/src/BulletMultiThreaded/vectormath2bullet.h @@ -30,7 +30,8 @@ #ifndef AOS_VECTORMATH_BULLET_CONVERT_H #define AOS_VECTORMATH_BULLET_CONVERT_H -#include +//#include +#include "BulletMultiThreaded/vectormath/scalar/cpp/vectormath_aos.h" #include "LinearMath/btVector3.h" #include "LinearMath/btQuaternion.h" #include "LinearMath/btMatrix3x3.h"