X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile;h=3ed4b862add7c91242c018185a5cf828aed85ec1;hb=5d5a6f3fc2e0bd7ef539cc7ac76c7650c8a80431;hp=d830a80b8ca74a7d438924dfb3ee230e20919697;hpb=046b034cd191d42dab6b27aa909b6044b0c7ca8a;p=physics.git

diff --git a/src/Makefile b/src/Makefile
index d830a80..3ed4b86 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,18 +1,31 @@
 
-LIBGL = -lGL -lGLU
-LIBSDL = `sdl-config --libs`
-LIBS = ${LIBSDL} ${LIBGL}
+LIBGL := -lGL -lGLU
+LIBSDL := `sdl-config --libs`
+LIBS := ${LIBSDL} ${LIBGL}
 
-CXX = g++
-CXXFLAGS = -ggdb -Wall -pedantic
+OPTFLAGS := -O2
+DBGFLAGS := -ggdb
+PRFFLAGS := ${DBGFLAGS} -pg
+VALFLAGS := --leak-check=full
 
-SRCS := entityManager.cpp
+#CXX := g++
+CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
+
+TARGET := ../run_physics
+
+SRCS := # simply to keep every line below the same
 SRCS += game.cpp
-SRCS += graphics.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
@@ -28,42 +41,107 @@ SRCS += GameStates/GameState.cpp
 SRCS += GameStates/Paused.cpp
 SRCS += GameStates/Running.cpp
 
-OBJS = ${SRCS:.cpp=.o}
+SRCS += Effects/Effect.cpp
+SRCS += Effects/Gravity.cpp
+SRCS += Effects/Screen.cpp
+
+SRCS += config/config.cpp
+
+SRCS += input/inputManager.cpp
+
+SRCS += graphics/graphics.cpp
+
+OBJSDIR := ../objs/
+OBJS := ${SRCS:.cpp=.o}
+OBJS := $(addprefix ${OBJSDIR},${OBJS})
+
+DEPSDIR := ../deps/
+DEPS := ${SRCS:.cpp=.d}
+DEPS := $(addprefix ${DEPSDIR},${DEPS})
 
-TARGET = ../run_physics
-DEPEND = depend.mk
+HRDS := ${SRCS:.cpp=.h}
+HRDS := $(filter-out main.h,$HRDS) # remove main.h
+HRDS += debug.h
 
+HRDS += graphics/colors.h
+
+TARS := ${SRCS} ${HRDS} Makefile
+
+
+VERBOSE := 0
+
+ifeq (${VERBOSE},0)
+    # quiet the echo command
+    Q1 := @
+    # quiet the command that is `replaced' by an echo
+    Q2 := @
+else
+    # EAT the echo command as if it was not there
+    Q1 := @true # NOTE: the space between @true and the # is VERY important!!
+    # do not quiet the command output
+    Q2 :=
+endif
 
 .PHONY: all
 all: ${TARGET}
 
 ${TARGET}: ${OBJS}
-	${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
+	${Q1}echo "${CXX}: $@"
+	${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
 
-.PHONY: depend
-depend: ${SRCS}
-	${CXX} -MM $^ > ${DEPEND}
+# rule to make a depend file from a .cpp
+${DEPSDIR}%.d: %.cpp
+	${Q1}echo "DEP: $@"
+	${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+
+# rule to make an object file from a .cpp
+${OBJSDIR}%.o: %.cpp
+	${Q1}echo "${CXX}: $@"
+	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
 
 .PHONY: clean
 clean:
-	rm -f ${OBJS} ${TARGET} *~
+	${Q1}echo "CLEAN: OBJS"
+	${Q2}rm -f ${OBJS}
+	${Q1}echo "CLEAN: TARGET"
+	${Q2}rm -f ${TARGET}
 
 .PHONY: distclean
 distclean: clean
-	rm -f tags depend.mk
-	touch depend.mk
+	${Q1}echo "CLEAN: DEPS"
+	${Q2}rm -f ${DEPS}
+	${Q1}echo "CLEAN: tags prof gmon.out"
+	${Q2}rm -f tags prof gmon.out
 
 tags: ${SRCS}
 	ctags $^
 
-tar: clean
-	cd ..; tar -cjf bluestar.tar.bz2 images/ source/
+.PHONY: tar
+tar: ../physics.tar.bz2
 
+.PHONY: ../physics.tar.bz2
+../physics.tar.bz2:
+	@echo "git-archive: Warning, archives HEAD not current"
+	${Q1}echo "git-archive: ../physics.tar.bz2"
+	${Q2}cd ..; git-archive --prefix=physics/ HEAD | bzip2 > physics.tar.bz2
 
 .PHONY: run
 run: all
-	../${TARGET}
+	${TARGET}
+
+.PHONY: gdb
+gdb: all
+	gdb ${TARGET}
+
+.PHONY: val
+val: all
+	valgrind ${VALFLAGS} ${TARGET}
 
-include ${DEPEND}
+.PHONY: prof
+prof: all
+	${TARGET}
+	gprof -b ${TARGET} > prof
+	kprof -f prof
 
+-include ${DEPS}