From 3d1f081343dc603a3292538eeb9bd794b255deb6 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Mon, 19 Jan 2009 00:02:52 -0500 Subject: [PATCH] removed all ../ entries and made a basic inc path (dependencies are currently broke) --- Makefile | 6 ++++-- src/Effects/Effect.h | 2 +- src/Effects/Gravity.cpp | 2 +- src/Effects/Gravity.h | 2 +- src/Effects/GravityWell.cpp | 2 +- src/Effects/GravityWell.h | 2 +- src/Effects/Screen.cpp | 4 ++-- src/Effects/Screen.h | 2 +- src/Entities/Ball.cpp | 6 +++--- src/Entities/Ball.h | 2 +- src/Entities/Entity.cpp | 2 +- src/Entities/Entity.h | 2 +- src/Entities/Line.cpp | 2 +- src/Entities/Line.h | 2 +- src/Entities/Particle.cpp | 2 +- src/Entities/Particle.h | 2 +- src/Entities/PhysicsEntity.cpp | 6 +++--- src/Entities/PhysicsEntity.h | 2 +- src/Entities/Point.cpp | 2 +- src/Entities/Point.h | 2 +- src/Entities/Polygon.cpp | 2 +- src/Entities/Polygon.h | 2 +- src/Entities/WindParticle.cpp | 2 +- src/Entities/WindParticle.h | 2 +- src/GameStates/Paused.cpp | 2 +- src/GameStates/Running.cpp | 2 +- src/config/config.cpp | 4 ++-- src/config/keys.cpp | 2 +- src/config/keys.h | 2 +- src/config/reader.cpp | 2 +- src/graphics/graphics.cpp | 4 ++-- src/graphics/graphics.h | 2 +- src/input/inputManager.cpp | 4 ++-- src/input/inputManager.h | 2 +- 34 files changed, 45 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index db26a37..fe38d97 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,8 @@ DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS}) BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR} +INCDIRS := ${SRCSDIR} + PRNTFMT := printf "%-5s: %s\n" @@ -94,14 +96,14 @@ ${BLDDIRS}: # rule to make an object file from a .cpp ${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q1}${PRNTFMT} "${CXX}" "$@" - ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< + ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< -I "${INCDIRS}" # rule to make a depend file from a .cpp # be clever and escape the / chars in file paths # DON'T simply use another sed delimiter or it can't appear in the file paths ${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@) ${Q1}${PRNTFMT} "DEP" "$@" - ${Q2}${CXX} -MM ${CXXFLAGS} $< | \ + ${Q2}${CXX} -MM ${CXXFLAGS} $< -I "${INCDIRS}" | \ sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@ # rule to copy the config files into the working directory diff --git a/src/Effects/Effect.h b/src/Effects/Effect.h index d6d3fd1..bdf8eb8 100644 --- a/src/Effects/Effect.h +++ b/src/Effects/Effect.h @@ -18,7 +18,7 @@ #ifndef EFFECT_H #define EFFECT_H -#include "../Vector2.h" +#include "Vector2.h" // Mutual headers ... diff --git a/src/Effects/Gravity.cpp b/src/Effects/Gravity.cpp index 3be7560..5c65451 100644 --- a/src/Effects/Gravity.cpp +++ b/src/Effects/Gravity.cpp @@ -17,7 +17,7 @@ #include "Gravity.h" -#include "../Entities/PhysicsEntity.h" +#include "Entities/PhysicsEntity.h" /// ***** Private Variables ***** diff --git a/src/Effects/Gravity.h b/src/Effects/Gravity.h index b38bbee..91be413 100644 --- a/src/Effects/Gravity.h +++ b/src/Effects/Gravity.h @@ -19,7 +19,7 @@ #define GRAVITY_H #include "Effect.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Effects/GravityWell.cpp b/src/Effects/GravityWell.cpp index 581d628..e7d0d44 100644 --- a/src/Effects/GravityWell.cpp +++ b/src/Effects/GravityWell.cpp @@ -16,7 +16,7 @@ */ #include "GravityWell.h" -#include "../Entities/PhysicsEntity.h" +#include "Entities/PhysicsEntity.h" float wellGravity = 0.5; diff --git a/src/Effects/GravityWell.h b/src/Effects/GravityWell.h index d6165d3..ffbd120 100644 --- a/src/Effects/GravityWell.h +++ b/src/Effects/GravityWell.h @@ -19,7 +19,7 @@ #define GRAVITYWELL_H #include "Effect.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Effects/Screen.cpp b/src/Effects/Screen.cpp index f7bf80e..9c0f283 100644 --- a/src/Effects/Screen.cpp +++ b/src/Effects/Screen.cpp @@ -17,8 +17,8 @@ #include "Screen.h" -#include "../Entities/PhysicsEntity.h" -#include "../Entities/Ball.h" +#include "Entities/PhysicsEntity.h" +#include "Entities/Ball.h" /// ***** Constructors/Destructors ***** diff --git a/src/Effects/Screen.h b/src/Effects/Screen.h index ff8111a..8ed0091 100644 --- a/src/Effects/Screen.h +++ b/src/Effects/Screen.h @@ -19,7 +19,7 @@ #define SCREEN_H #include "Effect.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Ball.cpp b/src/Entities/Ball.cpp index b3ca115..517c67a 100644 --- a/src/Entities/Ball.cpp +++ b/src/Entities/Ball.cpp @@ -16,10 +16,10 @@ */ #include "Ball.h" -#include "../debug.h" +#include "debug.h" -#include "../Vector2.h" -#include "../graphics/graphics.h" +#include "Vector2.h" +#include "graphics/graphics.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Ball.h b/src/Entities/Ball.h index d4d43a7..4e3219b 100644 --- a/src/Entities/Ball.h +++ b/src/Entities/Ball.h @@ -19,7 +19,7 @@ #define BALL_H #include "PhysicsEntity.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index a486ebd..847254a 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -17,7 +17,7 @@ #include "Entity.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index 91273d5..14242bc 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -18,7 +18,7 @@ #ifndef ENTITY_H #define ENTITY_H -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Line.cpp b/src/Entities/Line.cpp index 3d8387d..3be227a 100644 --- a/src/Entities/Line.cpp +++ b/src/Entities/Line.cpp @@ -17,7 +17,7 @@ #include "Line.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Line.h b/src/Entities/Line.h index 54bec64..e6159d1 100644 --- a/src/Entities/Line.h +++ b/src/Entities/Line.h @@ -19,7 +19,7 @@ #define LINE_H #include "Particle.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Particle.cpp b/src/Entities/Particle.cpp index b0f9aab..1d7472d 100644 --- a/src/Entities/Particle.cpp +++ b/src/Entities/Particle.cpp @@ -17,7 +17,7 @@ #include "Particle.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Particle.h b/src/Entities/Particle.h index 1121227..87b53ac 100644 --- a/src/Entities/Particle.h +++ b/src/Entities/Particle.h @@ -19,7 +19,7 @@ #define PARTICLE_H #include "Entity.h" -#include "../Vector2.h" +#include "Vector2.h" /// NOTE to SELF diff --git a/src/Entities/PhysicsEntity.cpp b/src/Entities/PhysicsEntity.cpp index 88c3525..9daff3a 100644 --- a/src/Entities/PhysicsEntity.cpp +++ b/src/Entities/PhysicsEntity.cpp @@ -16,10 +16,10 @@ */ #include "PhysicsEntity.h" -#include "../debug.h" +#include "debug.h" -#include "../effectManager.h" -#include "../Vector2.h" +#include "effectManager.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/PhysicsEntity.h b/src/Entities/PhysicsEntity.h index a682c9f..b4b5b9e 100644 --- a/src/Entities/PhysicsEntity.h +++ b/src/Entities/PhysicsEntity.h @@ -19,7 +19,7 @@ #define PHYSICS_H #include "Entity.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Point.cpp b/src/Entities/Point.cpp index 72dab3a..3031c6f 100644 --- a/src/Entities/Point.cpp +++ b/src/Entities/Point.cpp @@ -17,7 +17,7 @@ #include "Point.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Point.h b/src/Entities/Point.h index ede27d2..e0277f7 100644 --- a/src/Entities/Point.h +++ b/src/Entities/Point.h @@ -19,7 +19,7 @@ #define POINT_H #include "Particle.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/Entities/Polygon.cpp b/src/Entities/Polygon.cpp index 1861571..42cfbdb 100644 --- a/src/Entities/Polygon.cpp +++ b/src/Entities/Polygon.cpp @@ -17,7 +17,7 @@ #include "Polygon.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/Polygon.h b/src/Entities/Polygon.h index d775352..5d8d10d 100644 --- a/src/Entities/Polygon.h +++ b/src/Entities/Polygon.h @@ -19,7 +19,7 @@ #define POLYGON_H #include "PhysicsEntity.h" -#include "../Vector2.h" +#include "Vector2.h" #include using std::vector; diff --git a/src/Entities/WindParticle.cpp b/src/Entities/WindParticle.cpp index d0b0f3a..bd866ab 100644 --- a/src/Entities/WindParticle.cpp +++ b/src/Entities/WindParticle.cpp @@ -17,7 +17,7 @@ #include "WindParticle.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Constructors/Destructors ***** diff --git a/src/Entities/WindParticle.h b/src/Entities/WindParticle.h index 5b954b3..d50fbe7 100644 --- a/src/Entities/WindParticle.h +++ b/src/Entities/WindParticle.h @@ -19,7 +19,7 @@ #define WINDPARTICLE_H #include "Point.h" -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Class ***** diff --git a/src/GameStates/Paused.cpp b/src/GameStates/Paused.cpp index fea6de4..f2982b1 100644 --- a/src/GameStates/Paused.cpp +++ b/src/GameStates/Paused.cpp @@ -16,7 +16,7 @@ */ #include "Paused.h" -#include "../config/config.h" +#include "config/config.h" /// ***** Constructors/Destructors ***** diff --git a/src/GameStates/Running.cpp b/src/GameStates/Running.cpp index cafa9af..f85c30f 100644 --- a/src/GameStates/Running.cpp +++ b/src/GameStates/Running.cpp @@ -17,7 +17,7 @@ #include "Running.h" -#include "../entityManager.h" +#include "entityManager.h" /// ***** Constructors/Destructors ***** diff --git a/src/config/config.cpp b/src/config/config.cpp index bb7ea7a..709c5ff 100644 --- a/src/config/config.cpp +++ b/src/config/config.cpp @@ -16,13 +16,13 @@ */ #include "config.h" -#include "../debug.h" +#include "debug.h" #include #include "keys.h" #include "reader.h" -#include "../input/inputManager.h" +#include "input/inputManager.h" /// ***** Private Method Headers ***** /// ***** Private Variables ***** diff --git a/src/config/keys.cpp b/src/config/keys.cpp index e6eebf5..8832be5 100644 --- a/src/config/keys.cpp +++ b/src/config/keys.cpp @@ -16,7 +16,7 @@ */ #include "keys.h" -#include "../debug.h" +#include "debug.h" #include diff --git a/src/config/keys.h b/src/config/keys.h index 31dfcdd..285ecb6 100644 --- a/src/config/keys.h +++ b/src/config/keys.h @@ -24,7 +24,7 @@ #include #include -#include "../debug.h" +#include "debug.h" /// ***** Header Methods ***** namespace key diff --git a/src/config/reader.cpp b/src/config/reader.cpp index 0335faf..716ec36 100644 --- a/src/config/reader.cpp +++ b/src/config/reader.cpp @@ -16,7 +16,7 @@ */ #include "reader.h" -#include "../debug.h" +#include "debug.h" #include using std::cerr; diff --git a/src/graphics/graphics.cpp b/src/graphics/graphics.cpp index 17c2e38..537cdc8 100644 --- a/src/graphics/graphics.cpp +++ b/src/graphics/graphics.cpp @@ -16,14 +16,14 @@ */ #include "graphics.h" -#include "../debug.h" +#include "debug.h" #include #include #include #include -#include "../mathw.h" +#include "mathw.h" #include using std::cerr; diff --git a/src/graphics/graphics.h b/src/graphics/graphics.h index 0dc2f8b..1f23760 100644 --- a/src/graphics/graphics.h +++ b/src/graphics/graphics.h @@ -18,7 +18,7 @@ #ifndef GRAPHICS_H #define GRAPHICS_H -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Methods ***** diff --git a/src/input/inputManager.cpp b/src/input/inputManager.cpp index 94b645d..5a42b2c 100644 --- a/src/input/inputManager.cpp +++ b/src/input/inputManager.cpp @@ -16,11 +16,11 @@ */ #include "inputManager.h" -#include "../debug.h" +#include "debug.h" #include -#include "../config/keys.h" +#include "config/keys.h" /// ***** Private Variables ***** diff --git a/src/input/inputManager.h b/src/input/inputManager.h index e0450b2..7d156c4 100644 --- a/src/input/inputManager.h +++ b/src/input/inputManager.h @@ -19,7 +19,7 @@ #define INPUT_H #include -#include "../Vector2.h" +#include "Vector2.h" /// ***** Header Methods ***** -- 2.10.2