From: Patrik Gornicz Date: Wed, 16 Jul 2008 03:43:36 +0000 (-0400) Subject: tmp removed + make changes X-Git-Tag: physics-premerge~196^2 X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=commitdiff_plain;h=c0dadf29697f269467e00473672dcd25f6ae6a84;p=libbear.git tmp removed + make changes --- diff --git a/src/GameStates/Makefile b/src/GameStates/Makefile index 02c0cfd..8940e20 100644 --- a/src/GameStates/Makefile +++ b/src/GameStates/Makefile @@ -9,7 +9,7 @@ CXXFLAGS = -ggdb -Wall -pedantic LDFLAGS = -lc -SRCS = GameState.cpp +SRCS = GameState.cpp CreatingPolygon.cpp Paused.cpp Running.cpp OBJS = ${SRCS:.cpp=.o} TARGETS = GameStates.ld diff --git a/src/Makefile b/src/Makefile index c25ab1b..6de7bdb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ LIBS = ${LIBSDL} ${LIBGL} CXX = g++ CXXFLAGS = -ggdb -Wall -pedantic -SRCS = Vector2.cpp ticks.cpp main.cpp game.cpp entityManager.cpp gldraw.cpp graphics.cpp +SRCS = Vector2.cpp ticks.cpp main.cpp game.cpp entityManager.cpp graphics.cpp OBJS = ${SRCS:.cpp=.o} TARGETS = ../run_physics diff --git a/src/depend.mk b/src/depend.mk index 9eb1e16..c1f7549 100644 --- a/src/depend.mk +++ b/src/depend.mk @@ -1,9 +1,9 @@ Vector2.o: Vector2.cpp Vector2.h mathw.h ticks.o: ticks.cpp ticks.h main.o: main.cpp game.h ticks.h graphics.h -game.o: game.cpp game.h +game.o: game.cpp game.h GameStates/GameState.h GameStates/Running.h \ + GameStates/GameState.h GameStates/Paused.h GameStates/CreatingPolygon.h entityManager.o: entityManager.cpp entityManager.h Entities/Entity.h \ Entities/../Vector2.h Entities/Particle.h Entities/Entity.h \ Entities/PhysicsEntity.h -gldraw.o: gldraw.cpp -graphics.o: graphics.cpp +graphics.o: graphics.cpp graphics.h diff --git a/src/newfile.tmp b/src/newfile.tmp deleted file mode 100644 index fe03ba3..0000000 --- a/src/newfile.tmp +++ /dev/null @@ -1 +0,0 @@ -this is a new file, Hello World!