varible location differs in files ... static not working?

[physics.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 1e11991..a391724 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,11 +6,10 @@ LIBS := ${LIBSDL} ${LIBGL}
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
-VALFLAGS := --leak-check=full
-
-#CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
+VALFLAGS := --leak-check=full
+
 TARGET := ../run_physics
 
 SRCS := # simply to keep every line below the same
@@ -21,10 +20,10 @@ SRCS += ticks.cpp
 SRCS += Vector2.cpp
 SRCS += handleSignal.cpp
 
+SRCS += entityCreator.cpp
 SRCS += entityManager.cpp
 SRCS += effectManager.cpp
-SRCS += entityCreator.cpp
-SRCS += collisionHandler.cpp
+SRCS += collisionManager.cpp
 SRCS += CollisionInfo.cpp
 
 SRCS += Entities/Ball.cpp
@@ -43,9 +42,12 @@ SRCS += GameStates/Running.cpp
 
 SRCS += Effects/Effect.cpp
 SRCS += Effects/Gravity.cpp
+SRCS += Effects/GravityWell.cpp
 SRCS += Effects/Screen.cpp
 
-SRCS += configs/paused_cfg.cpp
+SRCS += config/config.cpp
+SRCS += config/reader.cpp
+SRCS += config/keys.cpp
 
 SRCS += input/inputManager.cpp
 
@@ -60,7 +62,7 @@ DEPS := ${SRCS:.cpp=.d}
 DEPS := $(addprefix ${DEPSDIR},${DEPS})
 
 HRDS := ${SRCS:.cpp=.h}
-HRDS := ${HRDS:main.h=} # remove main.h
+HRDS := $(filter-out main.h,$HRDS) # remove main.h
 HRDS += debug.h
 
 HRDS += graphics/colors.h
@@ -114,6 +116,16 @@ distclean: clean
        ${Q1}echo "CLEAN: tags prof gmon.out"
        ${Q2}rm -f tags prof gmon.out
 
+.PHONY: gitclean
+gitclean:
+       ${Q1}echo "git-clean: show, use gitcleanf to force"
+       ${Q2}cd ..; git clean -nxd
+
+.PHONY: gitcleanf
+gitcleanf:
+       ${Q1}echo "git-clean: forced"
+       ${Q2}cd ..; git clean -fxd
+
 tags: ${SRCS}
        ctags $^
 
@@ -128,7 +140,7 @@ tar: ../physics.tar.bz2
 
 .PHONY: run
 run: all
-       ${TARGET}
+       cd ..; ./run_physics
 
 .PHONY: gdb
 gdb: all