X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile;h=95fdbfc78c5cfb058bb3c6cc4ff448a0500fe8b4;hb=0376f786586cb8183437837007be8df7f054fb80;hp=4ae7179af6fc9f792d33cf85ad5b1f1a95b4441a;hpb=f72f4a59026b8daa160908170f366c843aca5bb9;p=physics.git

diff --git a/src/Makefile b/src/Makefile
index 4ae7179..95fdbfc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,45 +6,37 @@ LIBS := ${LIBSDL} ${LIBGL}
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
-
-#CXX := g++
 CXXFLAGS := -Wall -pedantic -ansi ${DBGFLAGS}
 
+VALFLAGS := --leak-check=full
+
 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 += Entities/Ball.cpp
-SRCS += Entities/Entity.cpp
-SRCS += Entities/Line.cpp
-SRCS += Entities/Particle.cpp
-SRCS += Entities/PhysicsEntity.cpp
-SRCS += Entities/Point.cpp
-SRCS += Entities/Polygon.cpp
-SRCS += Entities/WindParticle.cpp
-
-SRCS += GameStates/CreatingPolygon.cpp
-SRCS += GameStates/GameState.cpp
-SRCS += GameStates/Paused.cpp
-SRCS += GameStates/Running.cpp
-
-SRCS += input/inputManager.cpp
-
-SRCS += graphics/graphics.cpp
 
+DIRS := # := start
+DIRS += .
+DIRS += Entities
+DIRS += GameStates
+DIRS += Effects
+DIRS += config
+DIRS += input
+DIRS += graphics
+
+include $(addsuffix /files.mk,${DIRS})
+
+OBJSDIR := ../objs/
 OBJS := ${SRCS:.cpp=.o}
-DEPENDS := ${SRCS:.cpp=.d}
+OBJS := $(addprefix ${OBJSDIR},${OBJS})
+
+DEPSDIR := ../deps/
+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
 
 TARS := ${SRCS} ${HRDS} Makefile
@@ -66,18 +58,20 @@ endif
 
 .PHONY: all
 all: ${TARGET}
+	echo "${SRCS}"
+	echo "${FILES}"
 
 ${TARGET}: ${OBJS}
 	${Q1}echo "${CXX}: $@"
-	${Q2}${CXX} ${CXXFLAGS} -o ${TARGET} $^ ${LIBS}
+	${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
 
 # rule to make a depend file from a .cpp
-%.d: %.cpp
+${DEPSDIR}%.d: %.cpp
 	${Q1}echo "DEP: $@"
-	${Q2}${CXX} -M ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
+	${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,: , $@: ,' > $@
 
 # rule to make an object file from a .cpp
-%.o: %.cpp
+${OBJSDIR}%.o: %.cpp
 	${Q1}echo "${CXX}: $@"
 	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
 
@@ -91,32 +85,44 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	${Q1}echo "CLEAN: DEPENDS"
-	${Q2}rm -f ${DEPENDS}
+	${Q1}echo "CLEAN: DEPS"
+	${Q2}rm -f ${DEPS}
 	${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 $^
 
-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: tar
+tar: ../physics.tar.bz2
 
-git-tar:
+.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}
+	cd ..; ./run_physics
+
+.PHONY: gdb
+gdb: all
+	gdb ${TARGET}
 
 .PHONY: val
 val: all
-	valgrind --leak-check=full ${TARGET}
+	valgrind ${VALFLAGS} ${TARGET}
 
 .PHONY: prof
 prof: all
@@ -124,4 +130,4 @@ prof: all
 	gprof -b ${TARGET} > prof
 	kprof -f prof
 
--include ${DEPENDS}
+-include ${DEPS}