From e4d7555ada4b164f6ee12019356bdb0a12c5fbf9 Mon Sep 17 00:00:00 2001 From: Patrik Gornicz Date: Sat, 27 Sep 2008 23:30:34 -0400 Subject: [PATCH] correct mistake --- src/Effects/files.mk | 2 +- src/Entities/files.mk | 2 +- src/GameStates/files.mk | 2 +- src/Makefile | 2 -- src/config/files.mk | 2 +- src/files.mk | 4 ++-- src/graphics/files.mk | 2 +- src/input/files.mk | 2 +- 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Effects/files.mk b/src/Effects/files.mk index 96e7d02..96e19de 100644 --- a/src/Effects/files.mk +++ b/src/Effects/files.mk @@ -6,6 +6,6 @@ FILES += Gravity.cpp FILES += GravityWell.cpp FILES += Screen.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/Entities/files.mk b/src/Entities/files.mk index 3d008fa..e1e39d1 100644 --- a/src/Entities/files.mk +++ b/src/Entities/files.mk @@ -10,6 +10,6 @@ FILES += Point.cpp FILES += Polygon.cpp FILES += WindParticle.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/GameStates/files.mk b/src/GameStates/files.mk index b0b28e1..3a1e916 100644 --- a/src/GameStates/files.mk +++ b/src/GameStates/files.mk @@ -6,6 +6,6 @@ FILES += GameState.cpp FILES += Paused.cpp FILES += Running.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/Makefile b/src/Makefile index 95fdbfc..9f7a154 100644 --- a/src/Makefile +++ b/src/Makefile @@ -58,8 +58,6 @@ endif .PHONY: all all: ${TARGET} - echo "${SRCS}" - echo "${FILES}" ${TARGET}: ${OBJS} ${Q1}echo "${CXX}: $@" diff --git a/src/config/files.mk b/src/config/files.mk index bd06d8c..6480308 100644 --- a/src/config/files.mk +++ b/src/config/files.mk @@ -5,6 +5,6 @@ FILES += config.cpp FILES += reader.cpp FILES += keys.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/files.mk b/src/files.mk index bf09925..33564c6 100644 --- a/src/files.mk +++ b/src/files.mk @@ -1,4 +1,4 @@ -CURDIR := ./ +CURDIR := FILES := # insure blank FILES += game.cpp @@ -14,6 +14,6 @@ FILES += effectManager.cpp FILES += collisionManager.cpp FILES += CollisionInfo.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/graphics/files.mk b/src/graphics/files.mk index d730552..3a9c271 100644 --- a/src/graphics/files.mk +++ b/src/graphics/files.mk @@ -3,6 +3,6 @@ FILES := # insure blank FILES += graphics.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} diff --git a/src/input/files.mk b/src/input/files.mk index 3ca4ad0..abd97a1 100644 --- a/src/input/files.mk +++ b/src/input/files.mk @@ -3,6 +3,6 @@ FILES := # insure blank FILES += inputManager.cpp -FILES := $(addprefix,${CURDIR},${FILES}) +FILES := $(addprefix ${CURDIR},${FILES}) SRCS += ${FILES} -- 2.10.2