Cleanup

scripts/crown.lua

@@ -88,38 +88,6 @@ function crown_project(_name, _kind, _defines)
 		if _OPTIONS["with-bullet"] then
 			includedirs {
 				CROWN_DIR .. "3rdparty/bullet3/src",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Collision",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Collision/BroadPhaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Collision/NarrowPhaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Common",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Dynamics",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Dynamics/ConstraintSover",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Geometry",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/BroadphaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/initialize",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/NarrowPhaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/ParallelPrimitives",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/Raycast",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3OpenCL/RigidBody",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Serialize",
-				CROWN_DIR .. "3rdparty/bullet3/src/Bullet3Serialize/Bullet2FileLoader",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision/BroadphaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision/CollisionDispatch",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision/CollisionShapes",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision/Gimpact",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletCollision/NarrowPhaseCollision",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/Character",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/ConstraintSolver",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/Dynamics",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/Featherstone",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/MLCPSolvers",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletDynamics/Vehicle",
-				CROWN_DIR .. "3rdparty/bullet3/src/BulletSoftBody",
-				CROWN_DIR .. "3rdparty/bullet3/src/LinearMath",
-				CROWN_DIR .. "3rdparty/bullet3/src/clew",
 			}
 
 			links {

src/world/physics_world_bullet.cpp

@@ -21,30 +21,30 @@
 #include "resource_manager.h"
 #include "unit_manager.h"
 #include "vector3.h"
-#include <btBoxShape.h>
-#include <btBvhTriangleMeshShape.h>
-#include <btCapsuleShape.h>
-#include <btCollisionObject.h>
-#include <btCompoundShape.h>
-#include <btConvexHullShape.h>
-#include <btConvexTriangleMeshShape.h>
-#include <btDbvtBroadphase.h>
-#include <btDefaultCollisionConfiguration.h>
-#include <btDefaultMotionState.h>
-#include <btDiscreteDynamicsWorld.h>
-#include <btFixedConstraint.h>
-#include <btGhostObject.h>
-#include <btHeightfieldTerrainShape.h>
-#include <btHingeConstraint.h>
-#include <btIDebugDraw.h>
-#include <btKinematicCharacterController.h>
-#include <btPoint2PointConstraint.h>
-#include <btRigidBody.h>
-#include <btSequentialImpulseConstraintSolver.h>
-#include <btSliderConstraint.h>
-#include <btSphereShape.h>
-#include <btStaticPlaneShape.h>
-#include <btTriangleMesh.h>
+#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+#include <BulletCollision/CollisionDispatch/btGhostObject.h>
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+#include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btCapsuleShape.h>
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <BulletCollision/CollisionShapes/btConvexHullShape.h>
+#include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <BulletCollision/CollisionShapes/btSphereShape.h>
+#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
+#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
+#include <BulletDynamics/Character/btKinematicCharacterController.h>
+#include <BulletDynamics/ConstraintSolver/btFixedConstraint.h>
+#include <BulletDynamics/ConstraintSolver/btHingeConstraint.h>
+#include <BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h>
+#include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
+#include <BulletDynamics/ConstraintSolver/btSliderConstraint.h>
+#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+#include <LinearMath/btDefaultMotionState.h>
+#include <LinearMath/btIDebugDraw.h>
 
 namespace crown
 {