Make project compilable with GNU/Make

.gitignore

@@ -36,3 +36,5 @@ Makefile
 cmake_install.cmake
 install_manifest.txt
 
+# ---> Custom make
+bin/

Control/Controller.h

@@ -7,7 +7,7 @@
 
 // todo Use HardContacts with scopes like Visuals in Renderer
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
 
 class Controller {
 public:

Control/Input.h

@@ -6,7 +6,7 @@
 
 // Include
 #include <set>
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 
 class Input {

Control/InputAndJoy.h

@@ -9,7 +9,7 @@
  */
 
 // Includes
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <iostream>
 #include <vector>
 #include "Input.h"

Graphics/Renderer.cpp

@@ -3,7 +3,7 @@
 //
 
 #include <iostream>
-#include <SDL_image.h>
+#include <SDL2/SDL_image.h>
 #include "Renderer.h"
 
 #define RAD_TO_DEG 57.2957795130f

Graphics/Renderer.h

@@ -5,7 +5,7 @@
 #ifndef TINYSHOOTER_RENDERER_H
 #define TINYSHOOTER_RENDERER_H
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <vector>
 #include "Visual.h"
 

Graphics/Visual.h

@@ -5,7 +5,8 @@
 #ifndef TINYSHOOTER_VISUAL_H
 #define TINYSHOOTER_VISUAL_H
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
+#include <vector>
 
 /* class Visual :
  * Describe something to show.

Physics/Entity.cpp

@@ -45,7 +45,7 @@ void Entity::establishPhysicalLink() {
         std::cout << "Entity::establishPhysicalLink() > Body is invalid for a " << m_faction << " object." << std::endl;
         return;
     } else {
-        m_body->SetUserData(this);
+        m_body->GetUserData().pointer = (uintptr_t) this;
     }
 }
 

Physics/Entity.h

@@ -5,7 +5,7 @@
 #ifndef TINYSHOOTER_ENTITY_H
 #define TINYSHOOTER_ENTITY_H
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
 #include <vector>
 #include "../Graphics/Visual.h"
 

Physics/ScullingQuery.h

@@ -5,7 +5,8 @@
 #ifndef TINYSHOOTER_SCULLINGQUERY_H
 #define TINYSHOOTER_SCULLINGQUERY_H
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
+#include <vector>
 
 class ScullingQuery : public b2QueryCallback {
 public:

Physics/Soldier.cpp

@@ -67,7 +67,7 @@ void Soldier::update() {
             incomingFixture = c->GetFixtureB();
 
         // Detect bullet presence
-        Entity *incomingEntity((Entity *) incomingFixture->GetBody()->GetUserData());
+        Entity *incomingEntity((Entity *) incomingFixture->GetBody()->GetUserData().pointer);
 
         if (incomingEntity->getFaction() == BULLET) {
             // Damage

Physics/TinyWorld.cpp

@@ -73,7 +73,7 @@ void TinyWorld::collectVisuals(std::vector<Visual *> &scope, b2Vec2 center, b2Ve
 
     Entity *currentEntity;
     for (auto it(callback.getTab().begin()); it != callback.getTab().end(); it++) {
-        currentEntity = (Entity *) (*it)->GetUserData();
+        currentEntity = (Entity *) (*it)->GetUserData().pointer;
         scope.push_back(currentEntity->makeVisual());
     }
 }

Physics/TinyWorld.h

@@ -5,7 +5,7 @@
 #ifndef TINYSHOOTER_TINYWORLD_H
 #define TINYSHOOTER_TINYWORLD_H
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
 #include <list>
 #include "../Graphics/Visual.h"
 #include "Entity.h"

Physics/b2Angle.h

@@ -5,7 +5,7 @@
 #ifndef TINYSHOOTER_B2ANGLE_H
 #define TINYSHOOTER_B2ANGLE_H
 
-#include <Box2D/Box2D.h>
+#include <box2d/box2d.h>
 
 /**
  * Give angle between u and v

makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=
+LDFLAGS=-lSDL2 -lSDL2_image -lbox2d
+INC=
+LIB=
+
+EXEC=TinyShooter
+SRC=$(shell find . -name '*.cpp')
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf ./bin
+
+exec: $(EXEC)
+	./bin/$(EXEC)