added ball to ball collisions

[physics.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index e6fe96b..1e3e3f5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,13 +13,18 @@ CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 TARGET := ../run_physics
 
 SRCS := # simply to keep every line below the same
-SRCS += entityManager.cpp
-SRCS += entityCreator.cpp
 SRCS += game.cpp
 SRCS += main.cpp
 SRCS += mathw.cpp
 SRCS += ticks.cpp
 SRCS += Vector2.cpp
+SRCS += handleSignal.cpp
+
+SRCS += entityManager.cpp
+SRCS += effectManager.cpp
+SRCS += entityCreator.cpp
+SRCS += collisionHandler.cpp
+SRCS += CollisionInfo.cpp
 
 SRCS += Entities/Ball.cpp
 SRCS += Entities/Entity.cpp
@@ -35,6 +40,10 @@ SRCS += GameStates/GameState.cpp
 SRCS += GameStates/Paused.cpp
 SRCS += GameStates/Running.cpp
 
+SRCS += Effects/Effect.cpp
+SRCS += Effects/Gravity.cpp
+SRCS += Effects/Screen.cpp
+
 SRCS += input/inputManager.cpp
 
 SRCS += graphics/graphics.cpp
@@ -45,6 +54,7 @@ DEPENDS := ${SRCS:.cpp=.d}
 HRDS := ${SRCS:.cpp=.h}
 HRDS := ${HRDS:main.h=} # remove main.h
 HRDS += debug.h
+
 HRDS += graphics/colors.h
 
 TARS := ${SRCS} ${HRDS} Makefile
@@ -99,13 +109,15 @@ distclean: clean
 tags: ${SRCS}
        ctags $^
 
+.PHONY: tar
 tar:
-       ${Q1}echo "tar: physics.tar"
+       ${Q1}echo "tar: physics.tar.bz2"
        ${Q2}rm -f physics.tar # prevents appending
        ${Q2}for f in ${TARS}; do\
                tar -C ../.. -rf physics.tar "physics/src/$$f"; done
        ${Q2}bzip2 physics.tar
 
+.PHONY: git-tar
 git-tar:
        ${Q1}echo "git-archive: ../physics.tar.bz2"
        ${Q2}cd ..; git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
@@ -114,9 +126,13 @@ git-tar:
 run: all
        ${TARGET}
 
+.PHONY: gdb
+gdb: all
+       gdb ${TARGET}
+
 .PHONY: val
 val: all
-       valgrind ${TARGET}
+       valgrind --leak-check=full ${TARGET}
 
 .PHONY: prof
 prof: all