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

fix some recent compile issues

Browse Source
This commit is contained in:
erwin.coumans
2010-01-21 00:34:30 +00:00
parent fbc0d86cf6
commit 90ecf8ccc3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/SerializeDemo/CMakeLists.txt
View File

@@ -36,7 +36,7 @@ IF (USE_GLUT)
ADD_EXECUTABLE(AppSerializeDemo ADD_EXECUTABLE(AppSerializeDemo
main.cpp main.cpp
$(SERIALIZE_FILES) ${SERIALIZE_FILES}
SerializeDemo.cpp SerializeDemo.cpp
SerializeDemo.h SerializeDemo.h
) )
@@ -54,4 +54,4 @@ ELSE (USE_GLUT)
SerializeDemo.cpp SerializeDemo.cpp
SerializeDemo.h SerializeDemo.h
) )
ENDIF (USE_GLUT) ENDIF (USE_GLUT)

6
Demos/SerializeDemo/main.cpp
View File

@@ -13,7 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#include "BasicDemo.h" #include "SerializeDemo.h"
#include "GlutStuff.h" #include "GlutStuff.h"
#include "GLDebugDrawer.h" #include "GLDebugDrawer.h"
#include "btBulletDynamicsCommon.h" #include "btBulletDynamicsCommon.h"
@@ -73,7 +73,7 @@ int main(int argc,char** argv)
//printf("tmp value=%f,%f,%f\n",tmp->m_position.getX(),tmp->m_position.getY(),tmp->m_position.getZ()); //printf("tmp value=%f,%f,%f\n",tmp->m_position.getX(),tmp->m_position.getY(),tmp->m_position.getZ());
} }
BasicDemo ccdDemo; SerializeDemo ccdDemo;
ccdDemo.initPhysics(); ccdDemo.initPhysics();
ccdDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer); ccdDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer);
@@ -81,7 +81,7 @@ int main(int argc,char** argv)
#ifdef CHECK_MEMORY_LEAKS #ifdef CHECK_MEMORY_LEAKS
ccdDemo.exitPhysics(); ccdDemo.exitPhysics();
#else #else
return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bulletphysics.com",&ccdDemo); return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bulletphysics.org",&ccdDemo);
#endif #endif
//default glut doesn't return from mainloop //default glut doesn't return from mainloop