updated jamfile, updated optional ODE quickstep/box-box

2006-12-08 16:28:02 +00:00
parent 55d6b5b8e1
commit 1aa4e010f0
4 changed files with 11 additions and 8 deletions
--- a/Extras/quickstep/SorLcp.cpp
+++ b/Extras/quickstep/SorLcp.cpp
@@ -78,8 +78,8 @@ typedef btScalar dMatrix3[4*3];
  (A)[1] op dDOT1((B+4),(C)); \
  (A)[2] op dDOT1((B+8),(C));

-#define dAASSERT ASSERT
-#define dIASSERT ASSERT
+#define dAASSERT btAssert
+#define dIASSERT btAssert

 #define REAL float
 #define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)])