From 90ecf8ccc357e68c545e46f7c72df0ba029267ec Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 21 Jan 2010 00:34:30 +0000 Subject: [PATCH] fix some recent compile issues --- Demos/SerializeDemo/CMakeLists.txt | 4 ++-- Demos/SerializeDemo/main.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Demos/SerializeDemo/CMakeLists.txt b/Demos/SerializeDemo/CMakeLists.txt index 9702daf82..e66b35da7 100644 --- a/Demos/SerializeDemo/CMakeLists.txt +++ b/Demos/SerializeDemo/CMakeLists.txt @@ -36,7 +36,7 @@ IF (USE_GLUT) ADD_EXECUTABLE(AppSerializeDemo main.cpp - $(SERIALIZE_FILES) + ${SERIALIZE_FILES} SerializeDemo.cpp SerializeDemo.h ) @@ -54,4 +54,4 @@ ELSE (USE_GLUT) SerializeDemo.cpp SerializeDemo.h ) -ENDIF (USE_GLUT) \ No newline at end of file +ENDIF (USE_GLUT) diff --git a/Demos/SerializeDemo/main.cpp b/Demos/SerializeDemo/main.cpp index 605f6ea42..0edd77735 100644 --- a/Demos/SerializeDemo/main.cpp +++ b/Demos/SerializeDemo/main.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "BasicDemo.h" +#include "SerializeDemo.h" #include "GlutStuff.h" #include "GLDebugDrawer.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()); } - BasicDemo ccdDemo; + SerializeDemo ccdDemo; ccdDemo.initPhysics(); ccdDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer); @@ -81,7 +81,7 @@ int main(int argc,char** argv) #ifdef CHECK_MEMORY_LEAKS ccdDemo.exitPhysics(); #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 //default glut doesn't return from mainloop