diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt
index 04ed5abd4..261b7794d 100644
--- a/Demos/OpenGL/CMakeLists.txt
+++ b/Demos/OpenGL/CMakeLists.txt
@@ -28,3 +28,7 @@ ADD_LIBRARY(LibOpenGLSupport
 		RenderTexture.cpp
 		DemoApplication.cpp
 )
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibOpenGLSupport LibBulletDynamics LibBulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/Extras/BulletColladaConverter/CMakeLists.txt b/Extras/BulletColladaConverter/CMakeLists.txt
index 299ab7626..c65741897 100644
--- a/Extras/BulletColladaConverter/CMakeLists.txt
+++ b/Extras/BulletColladaConverter/CMakeLists.txt
@@ -6,3 +6,7 @@ ADD_LIBRARY(LibBulletColladaConverter
 			ColladaConverter.h
 			ColladaConverter.cpp
 )
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibBulletColladaConverter LibColladaDom LibBulletCollision LibBulletDynamics)
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/Extras/COLLADA_DOM/CMakeLists.txt b/Extras/COLLADA_DOM/CMakeLists.txt
index 53c8eea32..ac061a458 100644
--- a/Extras/COLLADA_DOM/CMakeLists.txt
+++ b/Extras/COLLADA_DOM/CMakeLists.txt
@@ -206,4 +206,8 @@ ADD_LIBRARY(LibColladaDom
 			src/modules/LIBXMLPlugin/daeLIBXMLResolver.cpp
 			src/modules/stdErrPlugin/stdErrPlugin.cpp
 			src/modules/STLDatabase/daeSTLDatabase.cpp
-)
\ No newline at end of file
+)
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibColladaDom LibXML)
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt
index ae325f496..7ac88e018 100644
--- a/Extras/ConvexDecomposition/CMakeLists.txt
+++ b/Extras/ConvexDecomposition/CMakeLists.txt
@@ -9,3 +9,7 @@ ConvexBuilder.h		bestfit.cpp		cd_hull.cpp		cd_wavefront.h		fitsphere.h		meshvolu
 ConvexDecomposition.cpp	bestfit.h		cd_hull.h		concavity.cpp		float_math.cpp		planetri.cpp		splitplane.cpp
 
 )
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibConvexDecomposition LibBulletCollision LibLinearMath)
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/Extras/GIMPACTUtils/CMakeLists.txt b/Extras/GIMPACTUtils/CMakeLists.txt
index 7e3455e72..f20b065e1 100644
--- a/Extras/GIMPACTUtils/CMakeLists.txt
+++ b/Extras/GIMPACTUtils/CMakeLists.txt
@@ -8,3 +8,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
 ADD_LIBRARY(LibGIMPACTUtils
 btGImpactConvexDecompositionShape.cpp	btGImpactConvexDecompositionShape.h
 )
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibGIMPACTUtils LibConvexDecomposition LibBulletCollision)
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/Extras/LibXML/include/libxml/xmlversion.h b/Extras/LibXML/include/libxml/xmlversion.h
index 08e4beff3..8606b2813 100644
--- a/Extras/LibXML/include/libxml/xmlversion.h
+++ b/Extras/LibXML/include/libxml/xmlversion.h
@@ -362,7 +362,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * Whether the module interfaces are compiled in
  */
-#if 1
+#if 0
 #define LIBXML_MODULES_ENABLED
 /**
  * LIBXML_MODULE_EXTENSION:
diff --git a/Extras/glui/CMakeLists.txt b/Extras/glui/CMakeLists.txt
index 6925cbf4f..4cd7e8946 100644
--- a/Extras/glui/CMakeLists.txt
+++ b/Extras/glui/CMakeLists.txt
@@ -60,3 +60,7 @@ algebra3.h			glui_bitmaps.cpp		glui_edittext.cpp		glui_mouse_iaction.cpp		glui_s
 arcball.cpp			glui_button.cpp			glui_filebrowser.cpp		glui_node.cpp			glui_separator.cpp		glui_tree.cpp
 	
 )
+
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibGLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt
index 2c9667012..1c333f1fd 100644
--- a/src/BulletCollision/CMakeLists.txt
+++ b/src/BulletCollision/CMakeLists.txt
@@ -1,194 +1,232 @@
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
-)
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
 
 SET(LibBulletCollision_SRCS
-				BroadphaseCollision/btAxisSweep3.cpp
-				BroadphaseCollision/btBroadphaseProxy.cpp
-				BroadphaseCollision/btCollisionAlgorithm.cpp
-				BroadphaseCollision/btDispatcher.cpp
-				BroadphaseCollision/btDbvtBroadphase.cpp
-				BroadphaseCollision/btDbvt.cpp
-				BroadphaseCollision/btMultiSapBroadphase.cpp
-				BroadphaseCollision/btOverlappingPairCache.cpp
-				BroadphaseCollision/btQuantizedBvh.cpp
-				BroadphaseCollision/btSimpleBroadphase.cpp
-				CollisionDispatch/btCollisionDispatcher.cpp
-				CollisionDispatch/btCollisionObject.cpp
-				CollisionDispatch/btCollisionWorld.cpp
-				CollisionDispatch/btCompoundCollisionAlgorithm.cpp
-				CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
-				CollisionDispatch/btDefaultCollisionConfiguration.cpp
-				CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
-				CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
-				CollisionDispatch/btBoxBoxDetector.cpp
-				CollisionDispatch/btGhostObject.cpp
-				CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
-				CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
-				CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
-				CollisionDispatch/btConvexConvexAlgorithm.cpp
-				CollisionDispatch/btEmptyCollisionAlgorithm.cpp
-				CollisionDispatch/btManifoldResult.cpp
-				CollisionDispatch/btSimulationIslandManager.cpp
-				CollisionDispatch/btUnionFind.cpp
-				CollisionDispatch/SphereTriangleDetector.cpp
-				CollisionShapes/btBoxShape.cpp
-				CollisionShapes/btBvhTriangleMeshShape.cpp
-				CollisionShapes/btCapsuleShape.cpp
-				CollisionShapes/btCollisionShape.cpp
-				CollisionShapes/btCompoundShape.cpp
-				CollisionShapes/btConcaveShape.cpp
-				CollisionShapes/btConeShape.cpp
-				CollisionShapes/btConvexHullShape.cpp
-				CollisionShapes/btConvexPointCloudShape.cpp
-				CollisionShapes/btConvexShape.cpp
-				CollisionShapes/btConvexInternalShape.cpp
-				CollisionShapes/btConvexTriangleMeshShape.cpp
-				CollisionShapes/btCylinderShape.cpp
-				CollisionShapes/btEmptyShape.cpp
-				CollisionShapes/btHeightfieldTerrainShape.cpp
-				CollisionShapes/btMinkowskiSumShape.cpp
-				CollisionShapes/btMultimaterialTriangleMeshShape.cpp
-				CollisionShapes/btMultiSphereShape.cpp
-				CollisionShapes/btOptimizedBvh.cpp
-				CollisionShapes/btPolyhedralConvexShape.cpp
-				CollisionShapes/btScaledBvhTriangleMeshShape.cpp
-				CollisionShapes/btTetrahedronShape.cpp
-				CollisionShapes/btSphereShape.cpp
-				CollisionShapes/btShapeHull.cpp
-				CollisionShapes/btStaticPlaneShape.cpp
-				CollisionShapes/btStridingMeshInterface.cpp
-				CollisionShapes/btTriangleCallback.cpp
-				CollisionShapes/btTriangleBuffer.cpp
-				CollisionShapes/btTriangleIndexVertexArray.cpp
-				CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
-				CollisionShapes/btTriangleMesh.cpp
-				CollisionShapes/btTriangleMeshShape.cpp
-				CollisionShapes/btUniformScalingShape.cpp
-				Gimpact/btContactProcessing.cpp
-				Gimpact/btGImpactShape.cpp
-				Gimpact/gim_contact.cpp
-				Gimpact/btGImpactBvh.cpp
-				Gimpact/btGenericPoolAllocator.cpp
-				Gimpact/gim_memory.cpp
-				Gimpact/btGImpactCollisionAlgorithm.cpp
-				Gimpact/btTriangleShapeEx.cpp
-				Gimpact/gim_tri_collision.cpp
-				Gimpact/btGImpactQuantizedBvh.cpp
-				Gimpact/gim_box_set.cpp
-				NarrowPhaseCollision/btContinuousConvexCollision.cpp
-				NarrowPhaseCollision/btGjkEpa2.cpp
-				NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
-				NarrowPhaseCollision/btConvexCast.cpp
-				NarrowPhaseCollision/btGjkConvexCast.cpp
-				NarrowPhaseCollision/btGjkPairDetector.cpp
-				NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
-				NarrowPhaseCollision/btPersistentManifold.cpp
-				NarrowPhaseCollision/btRaycastCallback.cpp
-				NarrowPhaseCollision/btSubSimplexConvexCast.cpp
-				NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+	BroadphaseCollision/btAxisSweep3.cpp
+	BroadphaseCollision/btBroadphaseProxy.cpp
+	BroadphaseCollision/btCollisionAlgorithm.cpp
+	BroadphaseCollision/btDispatcher.cpp
+	BroadphaseCollision/btDbvtBroadphase.cpp
+	BroadphaseCollision/btDbvt.cpp
+	BroadphaseCollision/btMultiSapBroadphase.cpp
+	BroadphaseCollision/btOverlappingPairCache.cpp
+	BroadphaseCollision/btQuantizedBvh.cpp
+	BroadphaseCollision/btSimpleBroadphase.cpp
+	CollisionDispatch/btCollisionDispatcher.cpp
+	CollisionDispatch/btCollisionObject.cpp
+	CollisionDispatch/btCollisionWorld.cpp
+	CollisionDispatch/btCompoundCollisionAlgorithm.cpp
+	CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+	CollisionDispatch/btDefaultCollisionConfiguration.cpp
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btBoxBoxDetector.cpp
+	CollisionDispatch/btGhostObject.cpp
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
+	CollisionDispatch/btConvexConvexAlgorithm.cpp
+	CollisionDispatch/btEmptyCollisionAlgorithm.cpp
+	CollisionDispatch/btManifoldResult.cpp
+	CollisionDispatch/btSimulationIslandManager.cpp
+	CollisionDispatch/btUnionFind.cpp
+	CollisionDispatch/SphereTriangleDetector.cpp
+	CollisionShapes/btBoxShape.cpp
+	CollisionShapes/btBvhTriangleMeshShape.cpp
+	CollisionShapes/btCapsuleShape.cpp
+	CollisionShapes/btCollisionShape.cpp
+	CollisionShapes/btCompoundShape.cpp
+	CollisionShapes/btConcaveShape.cpp
+	CollisionShapes/btConeShape.cpp
+	CollisionShapes/btConvexHullShape.cpp
+	CollisionShapes/btConvexPointCloudShape.cpp
+	CollisionShapes/btConvexShape.cpp
+	CollisionShapes/btConvexInternalShape.cpp
+	CollisionShapes/btConvexTriangleMeshShape.cpp
+	CollisionShapes/btCylinderShape.cpp
+	CollisionShapes/btEmptyShape.cpp
+	CollisionShapes/btHeightfieldTerrainShape.cpp
+	CollisionShapes/btMinkowskiSumShape.cpp
+	CollisionShapes/btMultimaterialTriangleMeshShape.cpp
+	CollisionShapes/btMultiSphereShape.cpp
+	CollisionShapes/btOptimizedBvh.cpp
+	CollisionShapes/btPolyhedralConvexShape.cpp
+	CollisionShapes/btScaledBvhTriangleMeshShape.cpp
+	CollisionShapes/btTetrahedronShape.cpp
+	CollisionShapes/btSphereShape.cpp
+	CollisionShapes/btShapeHull.cpp
+	CollisionShapes/btStaticPlaneShape.cpp
+	CollisionShapes/btStridingMeshInterface.cpp
+	CollisionShapes/btTriangleCallback.cpp
+	CollisionShapes/btTriangleBuffer.cpp
+	CollisionShapes/btTriangleIndexVertexArray.cpp
+	CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
+	CollisionShapes/btTriangleMesh.cpp
+	CollisionShapes/btTriangleMeshShape.cpp
+	CollisionShapes/btUniformScalingShape.cpp
+	Gimpact/btContactProcessing.cpp
+	Gimpact/btGImpactShape.cpp
+	Gimpact/gim_contact.cpp
+	Gimpact/btGImpactBvh.cpp
+	Gimpact/btGenericPoolAllocator.cpp
+	Gimpact/gim_memory.cpp
+	Gimpact/btGImpactCollisionAlgorithm.cpp
+	Gimpact/btTriangleShapeEx.cpp
+	Gimpact/gim_tri_collision.cpp
+	Gimpact/btGImpactQuantizedBvh.cpp
+	Gimpact/gim_box_set.cpp
+	NarrowPhaseCollision/btContinuousConvexCollision.cpp
+	NarrowPhaseCollision/btGjkEpa2.cpp
+	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+	NarrowPhaseCollision/btConvexCast.cpp
+	NarrowPhaseCollision/btGjkConvexCast.cpp
+	NarrowPhaseCollision/btGjkPairDetector.cpp
+	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
+	NarrowPhaseCollision/btPersistentManifold.cpp
+	NarrowPhaseCollision/btRaycastCallback.cpp
+	NarrowPhaseCollision/btSubSimplexConvexCast.cpp
+	NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+)
+
+SET(Root_HDRS
+	../btBulletCollisionCommon.h
+)
+SET(BroadphaseCollision_HDRS
+	BroadphaseCollision/btAxisSweep3.h
+	BroadphaseCollision/btBroadphaseInterface.h
+	BroadphaseCollision/btBroadphaseProxy.h
+	BroadphaseCollision/btCollisionAlgorithm.h
+	BroadphaseCollision/btDispatcher.h
+	BroadphaseCollision/btDbvtBroadphase.h
+	BroadphaseCollision/btDbvt.h
+	BroadphaseCollision/btMultiSapBroadphase.h
+	BroadphaseCollision/btOverlappingPairCache.h
+	BroadphaseCollision/btOverlappingPairCallback.h
+	BroadphaseCollision/btQuantizedBvh.h
+	BroadphaseCollision/btSimpleBroadphase.h
+)
+SET(CollisionDispatch_HDRS
+	CollisionDispatch/btCollisionConfiguration.h
+	CollisionDispatch/btCollisionCreateFunc.h
+	CollisionDispatch/btCollisionDispatcher.h
+	CollisionDispatch/btCollisionObject.h
+	CollisionDispatch/btCollisionWorld.h
+	CollisionDispatch/btCompoundCollisionAlgorithm.h
+	CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+	CollisionDispatch/btDefaultCollisionConfiguration.h
+	CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+	CollisionDispatch/btBoxBoxDetector.h
+	CollisionDispatch/btGhostObject.h
+	CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+	CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+	CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+	CollisionDispatch/btConvexConvexAlgorithm.h
+	CollisionDispatch/btEmptyCollisionAlgorithm.h
+	CollisionDispatch/btManifoldResult.h
+	CollisionDispatch/btSimulationIslandManager.h
+	CollisionDispatch/btUnionFind.h
+	CollisionDispatch/SphereTriangleDetector.h
+)
+SET(CollisionShapes_HDRS
+	CollisionShapes/btBoxShape.h
+	CollisionShapes/btBvhTriangleMeshShape.h
+	CollisionShapes/btCapsuleShape.h
+	CollisionShapes/btCollisionMargin
+	CollisionShapes/btCollisionShape.h
+	CollisionShapes/btCompoundShape.h
+	CollisionShapes/btConcaveShape.h
+	CollisionShapes/btConeShape.h
+	CollisionShapes/btConvexHullShape.h
+	CollisionShapes/btConvexPointCloudShape.h
+	CollisionShapes/btConvexShape.h
+	CollisionShapes/btConvexInternalShape.h
+	CollisionShapes/btConvexTriangleMeshShape.h
+	CollisionShapes/btCylinderShape.h
+	CollisionShapes/btEmptyShape.h
+	CollisionShapes/btHeightfieldTerrainShape.h
+	CollisionShapes/btMinkowskiSumShape.h
+	CollisionShapes/btMaterial.h
+	CollisionShapes/btMultimaterialTriangleMeshShape.h
+	CollisionShapes/btMultiSphereShape.h
+	CollisionShapes/btOptimizedBvh.h
+	CollisionShapes/btPolyhedralConvexShape.h
+	CollisionShapes/btScaledBvhTriangleMeshShape.h
+	CollisionShapes/btTetrahedronShape.h
+	CollisionShapes/btSphereShape.h
+	CollisionShapes/btShapeHull.h
+	CollisionShapes/btStaticPlaneShape.h
+	CollisionShapes/btStridingMeshInterface.h
+	CollisionShapes/btTriangleCallback.h
+	CollisionShapes/btTriangleBuffer.h
+	CollisionShapes/btTriangleIndexVertexArray.h
+	CollisionShapes/btTriangleIndexVertexMaterialArray.h
+	CollisionShapes/btTriangleMesh.h
+	CollisionShapes/btTriangleMeshShape.h
+	CollisionShapes/btUniformScalingShape.h
+)
+SET(Gimpact_HDRS
+	Gimpact/btGImpactShape.h
+	Gimpact/gim_contact.h
+	Gimpact/btGImpactBvh.h
+	Gimpact/btGenericPoolAllocator.h
+	Gimpact/gim_memory.h
+	Gimpact/btGImpactCollisionAlgorithm.h
+	Gimpact/btTriangleShapeEx.h
+	Gimpact/gim_tri_collision.h
+	Gimpact/btGImpactQuantizedBvh.h
+	Gimpact/gim_box_set.h
+)
+SET(NarrowPhaseCollision_HDRS
+	NarrowPhaseCollision/btContinuousConvexCollision.h
+	NarrowPhaseCollision/btConvexCast.h
+	NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+	NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+	NarrowPhaseCollision/btGjkConvexCast.h
+	NarrowPhaseCollision/btGjkEpa2.h
+	NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
+	NarrowPhaseCollision/btGjkPairDetector.h
+	NarrowPhaseCollision/btManifoldPoint.h
+	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+	NarrowPhaseCollision/btPersistentManifold.h
+	NarrowPhaseCollision/btPointCollector.h
+	NarrowPhaseCollision/btRaycastCallback.h
+	NarrowPhaseCollision/btSimplexSolverInterface.h
+	NarrowPhaseCollision/btSubSimplexConvexCast.h
+	NarrowPhaseCollision/btVoronoiSimplexSolver.h
 )
 
 SET(LibBulletCollision_HDRS
-				BroadphaseCollision/btAxisSweep3.h
-				BroadphaseCollision/btBroadphaseProxy.h
-				BroadphaseCollision/btCollisionAlgorithm.h
-				BroadphaseCollision/btDispatcher.h
-				BroadphaseCollision/btDbvtBroadphase.h
-				BroadphaseCollision/btDbvt.h
-				BroadphaseCollision/btMultiSapBroadphase.h
-				BroadphaseCollision/btOverlappingPairCache.h
-				BroadphaseCollision/btOverlappingPairCallback.h
-				BroadphaseCollision/btQuantizedBvh.h
-				BroadphaseCollision/btSimpleBroadphase.h
-				CollisionDispatch/btCollisionDispatcher.h
-				CollisionDispatch/btCollisionObject.h
-				CollisionDispatch/btCollisionWorld.h
-				CollisionDispatch/btCompoundCollisionAlgorithm.h
-				CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
-				CollisionDispatch/btDefaultCollisionConfiguration.h
-				CollisionDispatch/btSphereSphereCollisionAlgorithm.h
-				CollisionDispatch/btBoxBoxCollisionAlgorithm.h
-				CollisionDispatch/btBoxBoxDetector.h
-				CollisionDispatch/btGhostObject.h
-				CollisionDispatch/btSphereBoxCollisionAlgorithm.h
-				CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
-				CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
-				CollisionDispatch/btConvexConvexAlgorithm.h
-				CollisionDispatch/btEmptyCollisionAlgorithm.h
-				CollisionDispatch/btManifoldResult.h
-				CollisionDispatch/btSimulationIslandManager.h
-				CollisionDispatch/btUnionFind.h
-				CollisionDispatch/SphereTriangleDetector.h
-				CollisionShapes/btBoxShape.h
-				CollisionShapes/btBvhTriangleMeshShape.h
-				CollisionShapes/btCapsuleShape.h
-				CollisionShapes/btCollisionShape.h
-				CollisionShapes/btCompoundShape.h
-				CollisionShapes/btConcaveShape.h
-				CollisionShapes/btConeShape.h
-				CollisionShapes/btConvexHullShape.h
-				CollisionShapes/btConvexPointCloudShape.h
-				CollisionShapes/btConvexShape.h
-				CollisionShapes/btConvexInternalShape.h
-				CollisionShapes/btConvexTriangleMeshShape.h
-				CollisionShapes/btCylinderShape.h
-				CollisionShapes/btEmptyShape.h
-				CollisionShapes/btHeightfieldTerrainShape.h
-				CollisionShapes/btMinkowskiSumShape.h
-				CollisionShapes/btMaterial.h
-				CollisionShapes/btMultimaterialTriangleMeshShape.h
-				CollisionShapes/btMultiSphereShape.h
-				CollisionShapes/btOptimizedBvh.h
-				CollisionShapes/btPolyhedralConvexShape.h
-				CollisionShapes/btScaledBvhTriangleMeshShape.h
-				CollisionShapes/btTetrahedronShape.h
-				CollisionShapes/btSphereShape.h
-				CollisionShapes/btShapeHull.h
-				CollisionShapes/btStaticPlaneShape.h
-				CollisionShapes/btStridingMeshInterface.h
-				CollisionShapes/btTriangleCallback.h
-				CollisionShapes/btTriangleBuffer.h
-				CollisionShapes/btTriangleIndexVertexArray.h
-				CollisionShapes/btTriangleIndexVertexMaterialArray.h
-				CollisionShapes/btTriangleMesh.h
-				CollisionShapes/btTriangleMeshShape.h
-				CollisionShapes/btUniformScalingShape.h
-				Gimpact/btGImpactShape.h
-				Gimpact/gim_contact.h
-				Gimpact/btGImpactBvh.h
-				Gimpact/btGenericPoolAllocator.h
-				Gimpact/gim_memory.h
-				Gimpact/btGImpactCollisionAlgorithm.h
-				Gimpact/btTriangleShapeEx.h
-				Gimpact/gim_tri_collision.h
-				Gimpact/btGImpactQuantizedBvh.h
-				Gimpact/gim_box_set.h
-				NarrowPhaseCollision/btContinuousConvexCollision.h
-				NarrowPhaseCollision/btContinuousConvexCollision.h
-				NarrowPhaseCollision/btGjkEpa2.h
-				NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
-				NarrowPhaseCollision/btConvexCast.h
-				NarrowPhaseCollision/btGjkConvexCast.h
-				NarrowPhaseCollision/btGjkPairDetector.h
-				NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
-				NarrowPhaseCollision/btPersistentManifold.h
-				NarrowPhaseCollision/btRaycastCallback.h
-				NarrowPhaseCollision/btSubSimplexConvexCast.h
-				NarrowPhaseCollision/btVoronoiSimplexSolver.h
+	${Root_HDRS}
+	${BroadphaseCollision_HDRS}
+	${CollisionDispatch_HDRS}
+	${CollisionShapes_HDRS}
+	${Gimpact_HDRS}
+	${NarrowPhaseCollision_HDRS}
 )
 
 
-
-
 #ADD_LIBRARY(LibBulletCollision SHARED ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
-#TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath)
 
 ADD_LIBRARY(LibBulletCollision ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS})
+IF (BUILD_SHARED_LIBS)
+  TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath)
+ENDIF (BUILD_SHARED_LIBS)
 
-
-#INSTALL of other files requires CMake 2.6
+#INSTALL of other files requires CMake 2.6
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
 	#INSTALL_TARGETS(DESTINATION LibBulletCollision)
 	#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletCollision_HDRS})
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
+
+IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES FRAMEWORK true)
+
+	SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+	# Have to list out sub-directories manually:
+	SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
+	SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)
+	SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes)
+	SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact)
+	SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision)
+
+ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt
index 2112875fe..d7b8a8f4f 100644
--- a/src/BulletDynamics/CMakeLists.txt
+++ b/src/BulletDynamics/CMakeLists.txt
@@ -1,7 +1,5 @@
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
-)
-	
+INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } )
+
 SET(LibBulletDynamics_SRCS
 	ConstraintSolver/btContactConstraint.cpp
 	ConstraintSolver/btConeTwistConstraint.cpp
@@ -20,31 +18,65 @@ SET(LibBulletDynamics_SRCS
 	Vehicle/btWheelInfo.cpp
 )
 
-SET(LibBulletDynamics_HDRS
+SET(Root_HDRS
+	../btBulletDynamicsCommon.h
+	../btBulletCollisionCommon.h
+)
+SET(ConstraintSolver_HDRS
+	ConstraintSolver/btConstraintSolver.h
 	ConstraintSolver/btContactConstraint.h
+	ConstraintSolver/btContactSolverInfo.h
 	ConstraintSolver/btConeTwistConstraint.h
 	ConstraintSolver/btGeneric6DofConstraint.h
 	ConstraintSolver/btHingeConstraint.h
+	ConstraintSolver/btJacobianEntry.h
 	ConstraintSolver/btPoint2PointConstraint.h
 	ConstraintSolver/btSequentialImpulseConstraintSolver.h
 	ConstraintSolver/btSliderConstraint.h
 	ConstraintSolver/btSolve2LinearConstraint.h
+	ConstraintSolver/btSolverBody.h
+	ConstraintSolver/btSolverConstraint.h
 	ConstraintSolver/btTypedConstraint.h
+)
+SET(Dynamics_HDRS
+	Dynamics/btContinuousDynamicsWorld.h
 	Dynamics/btDiscreteDynamicsWorld.h
+	Dynamics/btDynamicsWorld.h
 	Dynamics/btSimpleDynamicsWorld.h
 	Dynamics/btRigidBody.h
+)
+SET(Vehicle_HDRS
 	Vehicle/btRaycastVehicle.h
+	Vehicle/btVehicleRaycaster.h
 	Vehicle/btWheelInfo.h
 )
 
-
+SET(LibBulletDynamics_HDRS
+	${Root_HDRS}
+	${ConstraintSolver_HDRS}
+	${Dynamics_HDRS}
+	${Vehicle_HDRS}
+)
 
 #ADD_LIBRARY(LibBulletDynamics SHARED ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
-#TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath)
 
 ADD_LIBRARY(LibBulletDynamics ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS})
+IF (BUILD_SHARED_LIBS)
+	TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath)
+ENDIF (BUILD_SHARED_LIBS)
 
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
 	#INSTALL(TARGETS LibBulletDynamics DESTINATION lib)
 	#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
+
+IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES FRAMEWORK true)
+	
+	SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+	# Have to list out sub-directories manually:
+	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)
+	
+ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
diff --git a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
index f121919c8..ac3353a86 100644
--- a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+++ b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -20,7 +20,7 @@ Written by: Marcus Hennix
 #ifndef CONETWISTCONSTRAINT_H
 #define CONETWISTCONSTRAINT_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt
index 63c8f939c..ffcce358d 100644
--- a/src/BulletMultiThreaded/CMakeLists.txt
+++ b/src/BulletMultiThreaded/CMakeLists.txt
@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+	${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp
 )
 
 ADD_LIBRARY(LibBulletMultiThreaded
@@ -66,3 +67,7 @@ ADD_LIBRARY(LibBulletMultiThreaded
 		SpuRaycastTask/SpuSubSimplexConvexCast.cpp
 		SpuRaycastTask/SpuSubSimplexConvexCast.h
 )
+
+IF (BUILD_SHARED_LIBS)
+	TARGET_LINK_LIBRARIES(LibBulletMultiThreaded LibBulletCollision)
+ENDIF (BUILD_SHARED_LIBS)
diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt
index 6ea264afa..07b1abd47 100644
--- a/src/BulletSoftBody/CMakeLists.txt
+++ b/src/BulletSoftBody/CMakeLists.txt
@@ -27,8 +27,16 @@ SET(LibBulletSoftBody_HDRS
 
 #ADD_LIBRARY(LibBulletSoftBody SHARED ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
 ADD_LIBRARY(LibBulletSoftBody  ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS})
+IF (BUILD_SHARED_LIBS)
+	TARGET_LINK_LIBRARIES(LibBulletSoftBody LibBulletDynamics)
+ENDIF (BUILD_SHARED_LIBS)
 
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
 	INSTALL(TARGETS LibBulletSoftBody DESTINATION lib)
 	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletSoftBody_HDRS})
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
\ No newline at end of file
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
+
+IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES FRAMEWORK true)
+	SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES PUBLIC_HEADER "${LibBulletSoftBody_HDRS}")
+ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt
index cf3da24b9..99d23a4c4 100644
--- a/src/LinearMath/CMakeLists.txt
+++ b/src/LinearMath/CMakeLists.txt
@@ -41,6 +41,11 @@ ADD_LIBRARY(LibLinearMath ${LibLinearMath_SRCS} ${LibLinearMath_HDRS})
 #FILES_MATCHING requires CMake 2.6
 
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
-INSTALL(TARGETS LibLinearMath DESTINATION lib)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
+	INSTALL(TARGETS LibLinearMath DESTINATION lib)
+	INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
 ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6)
+
+IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+	SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES FRAMEWORK true)
+	SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES PUBLIC_HEADER "${LibLinearMath_HDRS}")
+ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)