make Bullet compile on Visual Studio 6

This commit is contained in:
erwin.coumans
2010-01-30 23:10:12 +00:00
parent 788f48643b
commit e57f03599a
12 changed files with 515 additions and 481 deletions

View File

@@ -10,6 +10,7 @@
# You shouldn't have to modify anything below this line
########################################################
IF (USE_GLUT)
INCLUDE_DIRECTORIES(
@@ -25,3 +26,22 @@ ADD_EXECUTABLE(AppSoftBodyDemo
SoftDemo.cpp
)
IF (WIN32)
IF (CMAKE_CL_64)
ADD_CUSTOM_COMMAND(
TARGET AppSoftBodyDemo
POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
)
ELSE(CMAKE_CL_64)
ADD_CUSTOM_COMMAND(
TARGET AppSoftBodyDemo
POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
)
ENDIF(CMAKE_CL_64)
ENDIF(WIN32)
ELSE(USE_GLUT)
ENDIF (USE_GLUT)

View File

@@ -218,7 +218,7 @@ void SoftDemo::clientMoveAndDisplay()
#endif //PRINT_CONTACT_STATISTICS
glutSwapBuffers();
swapBuffers();
}
@@ -232,7 +232,7 @@ void SoftDemo::displayCallback(void) {
renderme();
glFlush();
glutSwapBuffers();
swapBuffers();
}

View File

@@ -19,7 +19,13 @@ subject to the following restrictions:
#ifndef SOFT_DEMO_H
#define SOFT_DEMO_H
#ifdef _WINDOWS
#include "Win32DemoApplication.h"
#define PlatformDemoApplication Win32DemoApplication
#else
#include "GlutDemoApplication.h"
#define PlatformDemoApplication GlutDemoApplication
#endif
#include "LinearMath/btAlignedObjectArray.h"
#include "BulletSoftBody/btSoftBody.h"
@@ -41,7 +47,7 @@ class btSoftRigidDynamicsWorld;
///CcdPhysicsDemo shows basic stacking using Bullet physics, and allows toggle of Ccd (using key '1')
class SoftDemo : public GlutDemoApplication
class SoftDemo : public PlatformDemoApplication
{
public: