updated build system for BulletDynamics/Character files

Demos/CharacterDemo/CMakeLists.txt

@@ -18,11 +18,8 @@ LINK_LIBRARIES(
 )
 
 ADD_EXECUTABLE(AppCharacterDemo
-	KinematicCharacterController.cpp
 	DynamicCharacterController.cpp
-	KinematicCharacterController.h
 	DynamicCharacterController.h
-	CharacterControllerInterface.h
 	CharacterDemo.cpp
 	CharacterDemo.h
 	../BspDemo/BspConverter.cpp

src/BulletDynamics/CMakeLists.txt

@@ -16,6 +16,7 @@ SET(BulletDynamics_SRCS
 	Dynamics/btRigidBody.cpp
 	Vehicle/btRaycastVehicle.cpp
 	Vehicle/btWheelInfo.cpp
+	Character/btKinematicCharacterController.cpp
 )
 
 SET(Root_HDRS
@@ -51,11 +52,19 @@ SET(Vehicle_HDRS
 	Vehicle/btWheelInfo.h
 )
 
+SET(Character_HDRS
+	Character/btCharacterControllerInterface.h
+	Character/btKinematicCharacterController.h
+)
+
+
+
 SET(BulletDynamics_HDRS
 	${Root_HDRS}
 	${ConstraintSolver_HDRS}
 	${Dynamics_HDRS}
 	${Vehicle_HDRS}
+	${Character_HDRS}
 )
 
 
@@ -79,5 +88,6 @@ IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	SET_PROPERTY(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver)
 	SET_PROPERTY(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics)
 	SET_PROPERTY(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle)
-	
+	SET_PROPERTY(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character)
+		
 ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)

src/Makefile.am

@@ -216,6 +216,9 @@ libbulletdynamics_a_SOURCES = \
 		BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp \
 		BulletDynamics/Vehicle/btWheelInfo.cpp \
 		BulletDynamics/Vehicle/btRaycastVehicle.cpp \
+		BulletDynamics/Character/btKinematicCharacterController.cpp \
+		BulletDynamics/Character/btKinematicCharacterController.h \
+		BulletDynamics/Character/btCharacterControllerInterface.h \		
 		BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
 		BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \
 		BulletDynamics/Dynamics/btRigidBody.h \