Merge branch 'fix/build-system'

Replace CMake by GNU/Make.

Fix project to be compilable.

.gitignore

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

CMakeLists.txt

@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 3.7)
-project(TinyShooter)
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
-
-find_package(SDL2)
-find_package(SDL2_image)
-find_package(Box2D)
-include_directories(${SDL2_INCLUDE_DIR} ${SDL2_IMAGE_INCLUDE_DIR} ${BOX2D_INCLUDE_DIR})
-
-set(CMAKE_CXX_STANDARD 11)
-
-set(SOURCE_FILES
-        main.cpp
-        GameCore.cpp
-        Control/Input.cpp
-        Control/InputAndJoy.cpp
-        Control/MouseCtrl.cpp
-        Control/JoyPadCtrl.cpp
-        Control/Controller.cpp
-        Graphics/Renderer.cpp
-        Graphics/Visual.cpp
-        Physics/TinyWorld.cpp
-        Physics/Entity.cpp
-        Physics/Wall.cpp
-        Physics/Bullet.cpp
-        Physics/Soldier.cpp
-        Physics/HumanSoldier.cpp
-        Physics/AISoldier.cpp
-        Physics/b2Angle.cpp
-        Physics/ScullingQuery.cpp)
-
-add_executable(TinyShooter ${SOURCE_FILES})
-
-target_link_libraries(TinyShooter ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${BOX2D_LIBRARY})

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

@@ -84,7 +84,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.cpp

@@ -18,5 +18,5 @@ float b2Angle(const b2Vec2 &u) {
 }
 
 b2Vec2 b2Dir(const float angle) {
-    return b2Vec2((float32) cos(angle), (float32) sin(angle));
+    return b2Vec2((float) cos(angle), (float) sin(angle));
 }

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=SpacyShooter
+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)

modules/FindBox2D.cmake

@@ -1,30 +0,0 @@
-# source: http://breathe.git.sourceforge.net
-#
-# Locate Box2D library
-# This module defines
-# BOX2D_LIBRARY, the name of the library to link against
-# BOX2D_FOUND, if false, do not try to link to Box2D
-# BOX2D_INCLUDE_DIR, where to find Box2D headers
-#
-# Created by Sven-Hendrik Haase. Based on the FindZLIB.cmake module.
-
-IF(BOX2D_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(BOX2D_FIND_QUIETLY TRUE)
-ENDIF(BOX2D_INCLUDE_DIR)
-
-FIND_PATH(BOX2D_INCLUDE_DIR Box2D/Box2D.h)
-
-SET(BOX2D_NAMES box2d Box2d BOX2D Box2D)
-FIND_LIBRARY(BOX2D_LIBRARY NAMES ${BOX2D_NAMES})
-MARK_AS_ADVANCED(BOX2D_LIBRARY BOX2D_INCLUDE_DIR)
-
-# Per-recommendation
-SET(BOX2D_INCLUDE_DIRS "${BOX2D_INCLUDE_DIR}")
-SET(BOX2D_LIBRARIES    "${BOX2D_LIBRARY}")
-
-# handle the QUIETLY and REQUIRED arguments and set BOX2D_FOUND to TRUE if
-# all listed variables are TRUE
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Box2D DEFAULT_MSG BOX2D_LIBRARY BOX2D_INCLUDE_DIR)

modules/FindSDL2.cmake

@@ -1,173 +0,0 @@
-
-# This module defines
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
-#
-# Don't forget to include SDLmain.h and SDLmain.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-# l.e.galup  9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# message("<FindSDL2.cmake>")
-
-SET(SDL2_SEARCH_PATHS
-	~/Library/Frameworks
-	/Library/Frameworks
-	/usr/local
-	/usr
-	/sw # Fink
-	/opt/local # DarwinPorts
-	/opt/csw # Blastwave
-	/opt
-	${SDL2_PATH}
-)
-
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-	HINTS
-	$ENV{SDL2DIR}
-	PATH_SUFFIXES include/SDL2 include
-	PATHS ${SDL2_SEARCH_PATHS}
-)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8) 
-	set(PATH_SUFFIXES lib64 lib/x64 lib)
-else() 
-	set(PATH_SUFFIXES lib/x86 lib)
-endif() 
-
-FIND_LIBRARY(SDL2_LIBRARY_TEMP
-	NAMES SDL2
-	HINTS
-	$ENV{SDL2DIR}
-	PATH_SUFFIXES ${PATH_SUFFIXES}
-	PATHS ${SDL2_SEARCH_PATHS}
-)
-
-IF(NOT SDL2_BUILDING_LIBRARY)
-	IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-		# Non-OS X framework versions expect you to also dynamically link to
-		# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-		# seem to provide SDL2main for compatibility even though they don't
-		# necessarily need it.
-		FIND_LIBRARY(SDL2MAIN_LIBRARY
-			NAMES SDL2main
-			HINTS
-			$ENV{SDL2DIR}
-			PATH_SUFFIXES ${PATH_SUFFIXES}
-			PATHS ${SDL2_SEARCH_PATHS}
-		)
-	ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-	FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional link flag, -mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows
-IF(MINGW)
-	SET(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-IF(SDL2_LIBRARY_TEMP)
-	# For SDL2main
-	IF(NOT SDL2_BUILDING_LIBRARY)
-		IF(SDL2MAIN_LIBRARY)
-			SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-		ENDIF(SDL2MAIN_LIBRARY)
-	ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-	# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-	# CMake doesn't display the -framework Cocoa string in the UI even
-	# though it actually is there if I modify a pre-used variable.
-	# I think it has something to do with the CACHE STRING.
-	# So I use a temporary variable until the end so I can set the
-	# "real" variable in one-shot.
-	IF(APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-	ENDIF(APPLE)
-
-	# For threads, as mentioned Apple doesn't need this.
-	# In fact, there seems to be a problem if I used the Threads package
-	# and try using this line, so I'm just skipping it entirely for OS X.
-	IF(NOT APPLE)
-		SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-	ENDIF(NOT APPLE)
-
-	# For MinGW library
-	IF(MINGW)
-		SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-	ENDIF(MINGW)
-
-	# Set the final string here so the GUI reflects the final state.
-	SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-	# Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-	SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
-ENDIF(SDL2_LIBRARY_TEMP)
-
-# message("</FindSDL2.cmake>")
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)

modules/FindSDL2_image.cmake

@@ -1,100 +0,0 @@
-# Locate SDL_image library
-#
-# This module defines:
-#
-# ::
-#
-#   SDL2_IMAGE_LIBRARIES, the name of the library to link against
-#   SDL2_IMAGE_INCLUDE_DIRS, where to find the headers
-#   SDL2_IMAGE_FOUND, if false, do not try to link against
-#   SDL2_IMAGE_VERSION_STRING - human-readable string containing the version of SDL_image
-#
-#
-#
-# For backward compatibility the following variables are also set:
-#
-# ::
-#
-#   SDLIMAGE_LIBRARY (same value as SDL2_IMAGE_LIBRARIES)
-#   SDLIMAGE_INCLUDE_DIR (same value as SDL2_IMAGE_INCLUDE_DIRS)
-#   SDLIMAGE_FOUND (same value as SDL2_IMAGE_FOUND)
-#
-#
-#
-# $SDLDIR is an environment variable that would correspond to the
-# ./configure --prefix=$SDLDIR used in building SDL.
-#
-# Created by Eric Wing.  This was influenced by the FindSDL.cmake
-# module, but with modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-
-#=============================================================================
-# Copyright 2005-2009 Kitware, Inc.
-# Copyright 2012 Benjamin Eikel
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-find_path(SDL2_IMAGE_INCLUDE_DIR SDL_image.h
-        HINTS
-        ENV SDL2IMAGEDIR
-        ENV SDL2DIR
-        PATH_SUFFIXES SDL2
-        # path suffixes to search inside ENV{SDLDIR}
-        include/SDL2 include
-        PATHS ${SDL2_IMAGE_PATH}
-        )
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(VC_LIB_PATH_SUFFIX lib/x64)
-else()
-    set(VC_LIB_PATH_SUFFIX lib/x86)
-endif()
-
-find_library(SDL2_IMAGE_LIBRARY
-        NAMES SDL2_image
-        HINTS
-        ENV SDL2IMAGEDIR
-        ENV SDL2DIR
-        PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
-        PATHS ${SDL2_IMAGE_PATH}
-        )
-
-if(SDL2_IMAGE_INCLUDE_DIR AND EXISTS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h")
-    file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_IMAGE_MAJOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_IMAGE_MINOR_VERSION[ \t]+[0-9]+$")
-    file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL_image.h" SDL2_IMAGE_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_IMAGE_PATCHLEVEL[ \t]+[0-9]+$")
-    string(REGEX REPLACE "^#define[ \t]+SDL_IMAGE_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MAJOR "${SDL2_IMAGE_VERSION_MAJOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_IMAGE_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MINOR "${SDL2_IMAGE_VERSION_MINOR_LINE}")
-    string(REGEX REPLACE "^#define[ \t]+SDL_IMAGE_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_PATCH "${SDL2_IMAGE_VERSION_PATCH_LINE}")
-    set(SDL2_IMAGE_VERSION_STRING ${SDL2_IMAGE_VERSION_MAJOR}.${SDL2_IMAGE_VERSION_MINOR}.${SDL2_IMAGE_VERSION_PATCH})
-    unset(SDL2_IMAGE_VERSION_MAJOR_LINE)
-    unset(SDL2_IMAGE_VERSION_MINOR_LINE)
-    unset(SDL2_IMAGE_VERSION_PATCH_LINE)
-    unset(SDL2_IMAGE_VERSION_MAJOR)
-    unset(SDL2_IMAGE_VERSION_MINOR)
-    unset(SDL2_IMAGE_VERSION_PATCH)
-endif()
-
-set(SDL2_IMAGE_LIBRARIES ${SDL2_IMAGE_LIBRARY})
-set(SDL2_IMAGE_INCLUDE_DIRS ${SDL2_IMAGE_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_image
-        REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS
-        VERSION_VAR SDL2_IMAGE_VERSION_STRING)
-
-# for backward compatibility
-set(SDLIMAGE_LIBRARY ${SDL2_IMAGE_LIBRARIES})
-set(SDLIMAGE_INCLUDE_DIR ${SDL2_IMAGE_INCLUDE_DIRS})
-set(SDLIMAGE_FOUND ${SDL2_IMAGE_FOUND})
-
-mark_as_advanced(SDL2_IMAGE_LIBRARY SDL2_IMAGE_INCLUDE_DIR)