changed all directory usages to dir/name instead of dir/name/

[physics.git] / src / files.mk

diff --git a/src/files.mk b/src/files.mk
index 5c22328..246a42d 100644 (file)
--- a/src/files.mk
+++ b/src/files.mk
@@ -13,29 +13,25 @@ NEWSRCS += CollisionInfo.cpp
 
 NEWDIRS := # := start; empty
 
-NEWDIRS += Entities/
-NEWDIRS += GameStates/
-NEWDIRS += Effects/
-NEWDIRS += config/
-NEWDIRS += input/
-NEWDIRS += graphics/
+NEWDIRS += Entities
+NEWDIRS += GameStates
+NEWDIRS += Effects
+NEWDIRS += config
+NEWDIRS += input
+NEWDIRS += graphics
 
 ################################################################################
 
-NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS})
-NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS})
-NEWOBJS := ${NEWSRCS:.cpp=.o}
-NEWDEPS := ${NEWSRCS:.cpp=.d}
-
-NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS})
-NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS})
+NEWSRCS := $(addprefix ${CURDIR}/,${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR}/,${NEWDIRS})
 
 # Append to lists
 
 L_SRCS_$P     += ${NEWSRCS}
-L_OBJS_$P     += $(addprefix ${OBJSDIR_$P},${NEWOBJS})
-L_DEPS_$P     += $(addprefix ${DEPSDIR_$P},${NEWDEPS})
 
-L_BLDDIRS_$P  += ${NEWOBJSDIRS}
-L_BLDDIRS_$P  += ${NEWDEPSDIRS}
+L_OBJS_$P     += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o}
+L_DEPS_$P     += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d}
+
+L_BLDDIRS_$P  += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%}
+L_BLDDIRS_$P  += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%}