Added Makefile

Added a simple Makefile (have not tested it yet)

Author: Patrick Rye

Makefile

@@ -0,0 +1,36 @@
+# Basic Make file (haven't tested it yet)
+CC=g++
+# Flags to be used 
+CFLAGS=-w -s -Os -std=c++11
+# Linked libraries
+LDFLAGS=-lSDL2main -lSDL2 -lSDL2_image
+# Path to .cpp files
+SRCPATH = ./src/
+# Name of the executable made
+EXECUTABLE=cannon
+# Include Flags to look in Src folder
+INCLUDEFLAGS=-I. -I$(SRCPATH)
+
+all: project
+
+project: main.o cannonball.o config.o screen.o tick.o
+    $(CC) $(CFLAGS) main.o cannonball.o config.o screen.o tick.o -o $(EXECUTABLE) $(LDFLAGS)
+
+main.o: $(SRCPATH)main.cpp $(SRCPATH)version.h $(SRCPATH)global.h $(SRCPATH)screen.h $(SRCPATH)cannonball.h $(SRCPATH)tick.h $(SRCPATH)config.h
+    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)main.cpp -c main.o
+
+cannonball.o: $(SRCPATH)cannonball.cpp $(SRCPATH)cannonball.h $(SRCPATH)screen.h
+    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)cannonball.cpp -c cannonball.o
+
+config.o: $(SRCPATH)config.cpp $(SRCPATH)config.h $(SRCPATH)version.h
+    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)config.cpp -c config.o
+
+screen.o: $(SRCPATH)screen.cpp $(SRCPATH)screen.h $(SRCPATH)image_ball.xpm $(SRCPATH)image_pixel.xpm
+    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)screen.cpp -c screen.o
+
+tick.o: $(SRCPATH)tick.cpp $(SRCPATH)tick.h
+    $(CC) $(CFLAGS) $(INCLUDEFLAGS) $(SRCPATH)tick.cpp -c tick.o
+
+clean:
+    rm *o $(EXECUTABLE)
+

project/SDL-Cannon-Simulation.cbp

@@ -110,6 +110,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-std=c++11" />
+			<Add option="-Wno-write-strings" />
 			<Add directory="C:/MinGW/SDL2-2.0.4/i686-w64-mingw32/include" />
 			<Add directory="../SDL2Stuff/include" />
 		</Compiler>

src/main.cpp

@@ -57,7 +57,7 @@ namespace Global {
 //This is the maximum number of cannonballs which can be "alive" at a time
 #define DEFINED_CANNONBALL_LIMIT 20
 //IF this is not commented out then program will use unrealistic method that will increase velocity the closer they are together
-//#define DEFINED_USE_R2_VEL_MODDER
+#define DEFINED_USE_R2_VEL_MODDER
 /**********************************************************************************************************************************************************************/
 clsCannonball Cannonballs[DEFINED_CANNONBALL_LIMIT];
 /**********************************************************************************************************************************************************************/
@@ -194,7 +194,7 @@ bool checkCollide(BOX A, BOX B) { //checks if two objects (made with the BOXES c
 }
 /**********************************************************************************************************************************************************************/
 void doCollision(uint numA, uint numB) {
-    dblXY Avel, Bvel, NewVel;
+    dblXY Avel, Bvel;
     PP Aprops, Bprops;
 
     Avel = Cannonballs[numA].getVelocity();

src/screen.cpp

@@ -1,6 +1,10 @@
 /**********************************************************************************************************************************************************************/
 #include "screen.h"
 /**********************************************************************************************************************************************************************/
+//Include the xpm files which present the images.
+#include "image_ball.xpm"
+#include "image_pixel.xpm"
+/**********************************************************************************************************************************************************************/
 clsScreen::clsScreen() {
     window.width = Global::Config.values.uintScreenWidth;
     window.height = Global::Config.values.uintScreenHeight;

src/screen.h

@@ -8,10 +8,6 @@
 #include "config.h"
 #include "global.h"
 /**********************************************************************************************************************************************************************/
-//Include the xpm files which present the images.
-#include "image_ball.xpm"
-#include "image_pixel.xpm"
-/**********************************************************************************************************************************************************************/
 struct stcWinAtt { //Attribute of the window
     uint width;
     uint height;