More general complication that looks for bullet includes using pkg-config
More general complication that looks for bullet includes using pkg-config

--- a/build/Makefile
+++ b/build/Makefile
@@ -24,12 +24,12 @@
 # compiler flags for compiling and linking

 FLAGS = -Wall -ansi -O3 -fPIC

 # flags for the headers location

-CFLAGS= -I/home/kkrizka/dev/irrlicht-svn/include/irrlicht/ -I/usr/include/bullet

+CFLAGS= -I/home/kkrizka/dev/irrlicht-svn/include/irrlicht/ `pkg-config bullet --cflags`

 # flags for the libs location

-LIBS= -shared -fPIC `pkg-config bullet --libs` -lIrrlicht -lGL -lXxf86vm -lXext -lX11

+LIBS= -shared -fPIC `pkg-config bullet --libs` -L/home/kkrizka/dev/irrlicht-svn/lib -lIrrlicht -lGL -lXxf86vm -lXext -lX11

 

 # file endings that are recognized as source code (REGEXP, MUST BEGIN WITH .\)

-ENDING = '\.cpp$$'

+ENDING = '\.cpp'

 

 # in which directories shall we search for source code?

 SEARCH_IN_DIRS = '../source'

@@ -106,6 +106,7 @@
 

 $(OF): $(OBJ)

 #	$(CC) $(FLAGS) $(LIBS) $(OBJ) -o $(OF)

+	echo $(SOURCES) | sed 's/$(ENDING)$$/\.o/g'

 	$(CC) $(FLAGS) $(OBJ) -o $(OF) $(LIBS)

 ifdef OF_SLINK

 	if ! test -f $(OF_SLINK); then ln -s $(OF) $(OF_SLINK); fi


--- a/source/boxshape.cpp
+++ b/source/boxshape.cpp
@@ -4,8 +4,8 @@
 // The above copyright notice and its accompanying information must remain here.

 

 #include <ISceneNode.h>

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include "boxshape.h"

 

 using namespace irr;


--- a/source/bulletworld.cpp
+++ b/source/bulletworld.cpp
@@ -6,12 +6,12 @@
 #include <IrrlichtDevice.h>

 #include <IGUIEnvironment.h>

 #include <IGUIStaticText.h>

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

-#include "bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"

-#include <bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h>

-#include "bullet/BulletCollision/CollisionDispatch/btGhostObject.h"

-#include "bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

+#include <BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h>

+#include <BulletSoftBody/btSoftSoftCollisionAlgorithm.h>

+#include <BulletCollision/CollisionDispatch/btGhostObject.h>

+#include <BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h>

 #include "liquidbody.h"

 

 #include "bulletworld.h"


--- a/source/collisionobject.cpp
+++ b/source/collisionobject.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include <ISceneManager.h>

 #include <IFileSystem.h>

 #include <IMeshSceneNode.h>


--- a/source/collisionobject.h
+++ b/source/collisionobject.h
@@ -8,7 +8,7 @@
 

 #include "irrbulletcommon.h"

 #include "collisionshape.h"

-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"

+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>

 #include "collisionobjectaffector.h"

 #include <IAttributes.h>

 


--- a/source/convexhullshape.cpp
+++ b/source/convexhullshape.cpp
@@ -5,8 +5,8 @@
 

 #include <IMesh.h>

 #include <IMeshBuffer.h>

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include "collisionshape.h"

 #include "convexhullshape.h"

 


--- a/source/gimpactmeshshape.cpp
+++ b/source/gimpactmeshshape.cpp
@@ -3,9 +3,9 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

-#include "bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

+#include <BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h>

 #include "gimpactmeshshape.h"

 

 


--- a/source/gimpactmeshshape.h
+++ b/source/gimpactmeshshape.h
@@ -7,7 +7,7 @@
 #define __G_IMPACT_MESH_SHAPE_H_INCLUDED__

 

 #include "irrbulletcommon.h"

-#include "BulletCollision/Gimpact/btGImpactShape.h"

+#include <BulletCollision/Gimpact/btGImpactShape.h>

 #include "trianglemeshshape.h"

 

 


--- a/source/irrbullet.h
+++ b/source/irrbullet.h
@@ -31,9 +31,9 @@
 #define __IRR_BULLET_H_INCLUDED__

 

 #include "irrbullet_compile_config.h"

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

-#include "bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

+#include <BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h>

 #include "irrbulletcommon.h"

 #include "bulletworld.h"

 #include "boxshape.h"


--- a/source/irrbulletcommon.cpp
+++ b/source/irrbulletcommon.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 

 #include "raycastvehicle.h"

 #include "collisionobject.h"


--- a/source/irrbulletcommon.h
+++ b/source/irrbulletcommon.h
@@ -8,7 +8,7 @@
 

 #define BIT(x) (1<<(x)) // For collision masking

 

-#include <matrix4.h>

+//#include <matrix4.h>

 #include <ISceneNode.h>

 

 


--- a/source/motionstate.cpp
+++ b/source/motionstate.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include "motionstate.h"

 #include "bulletworld.h"

 #include <ISceneManager.h>


--- a/source/rigidbody.cpp
+++ b/source/rigidbody.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include <ISceneManager.h>

 #include <IFileSystem.h>

 #include <IrrlichtDevice.h>


--- a/source/softbody.h
+++ b/source/softbody.h
@@ -7,8 +7,8 @@
 #define __SOFTBODY_H_INCLUDED__

 

 #include "collisionobject.h"

-#include "BulletSoftBody/btSoftBodyHelpers.h"

-#include "BulletSoftBody/btSoftBody.h"

+#include <BulletSoftBody/btSoftBodyHelpers.h>

+#include <BulletSoftBody/btSoftBody.h>

 #include <irrTypes.h>

 #include <map>

 #include <vector>


--- a/source/sphereshape.cpp
+++ b/source/sphereshape.cpp
@@ -3,8 +3,8 @@
 // For conditions of distribution and use, see license in irrbullet.h

 // The above copyright notice and its accompanying information must remain here.

 

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include "sphereshape.h"

 

 using namespace irr;


--- a/source/sphereshape.h
+++ b/source/sphereshape.h
@@ -8,7 +8,7 @@
 

 

 #include "collisionshape.h"

-#include "bullet/BulletCollision/CollisionShapes/btSphereShape.h"

+#include <BulletCollision/CollisionShapes/btSphereShape.h>

 

 

 class ISphereShape : public ICollisionShape


--- a/source/trianglemeshshape.cpp
+++ b/source/trianglemeshshape.cpp
@@ -5,8 +5,8 @@
 

 #include <IMesh.h>

 #include <IMeshBuffer.h>

-#include "bullet/btBulletDynamicsCommon.h"

-#include "bullet/btBulletCollisionCommon.h"

+#include <btBulletDynamicsCommon.h>

+#include <btBulletCollisionCommon.h>

 #include "trianglemeshshape.h"

 

 using namespace irr;


--- a/source/trianglemeshshape.h
+++ b/source/trianglemeshshape.h
@@ -7,7 +7,7 @@
 #define __TRIANGLE_MESH_SHAPE_H_INCLUDED__

 

 #include "collisionshape.h"

-#include "bullet/BulletCollision/CollisionShapes/btTriangleMesh.h"

+#include <BulletCollision/CollisionShapes/btTriangleMesh.h>

 #include "irrbulletcommon.h"

 

 namespace irr