Merge branch 'master' of http://git.topost.net/alistair/space_game

.gitignore

@@ -4,4 +4,5 @@ sillystrings.h
 debug.log
 *.o
 vgcore*
-
+main
+*.out

Makefile (SFConflict mail@alistairmichael.com 2019-08-01-11-07-48)

@@ -1,30 +0,0 @@
-CXX = gcc
-SDL_INCLUDE = -lSDL2 -lSDL2_image 
-CXXFLAGS = $(SDL_INCLUDE)
-EXE = main 
-
-default: all
-
-run: all
-	./$(EXE)
-
-all: $(EXE)
-
-$(EXE): main.o logger.o game.o
-	$(CXX) $(CXXFLAGS) -o $(EXE)  main.o game.o logger.o 
-
-main.o: main.c logger.h game.h
-	$(CXX) $(CXXFLAGS) -c main.c  
-
-logger.o: logger.c logger.h
-	$(CXX) $(CXXFLAGS) -c logger.c   
-
-game.o: game.c game.h
-	$(CXX) $(CXXFLAGS) -c game.c   
-
-clean:
-
-	rm *.o && rm $(EXE)
-
-
-