projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update thread setup with a good cap
[physics.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
ecfbc07
..
56bb7d6
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-7,25
+7,26
@@
OPTFLAGS := -O2
DBGFLAGS := -ggdb
PRFFLAGS := ${DBGFLAGS} -pg
MYFLAGS := -Wall -pedantic -ansi
DBGFLAGS := -ggdb
PRFFLAGS := ${DBGFLAGS} -pg
MYFLAGS := -Wall -pedantic -ansi
-CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
VALFLAGS := --leak-check=full
VALFLAGS := --leak-check=full
+CXXFLAGS := ${MYFLAGS} ${OPTFLAGS}
CXX := g++
CXX := g++
-SRCS := # := start
-
DIRS := # := start
DIRS := # := start
-DIRS += .
-DIRS += Entities
-DIRS += GameStates
-DIRS += Effects
-DIRS += config
-DIRS += input
-DIRS += graphics
+DIRS += .
/
+DIRS += Entities
/
+DIRS += GameStates
/
+DIRS += Effects
/
+DIRS += config
/
+DIRS += input
/
+DIRS += graphics
/
+SRCS := # := start
include $(addsuffix /files.mk,${DIRS})
include $(addsuffix /files.mk,${DIRS})
+WORKINGDIR := ../bin/
+
OBJSDIR := ../objs/
OBJS := ${SRCS:.cpp=.o}
OBJS := $(addprefix ${OBJSDIR},${OBJS})
OBJSDIR := ../objs/
OBJS := ${SRCS:.cpp=.o}
OBJS := $(addprefix ${OBJSDIR},${OBJS})
@@
-34,12
+35,21
@@
DEPSDIR := ../deps/
DEPS := ${SRCS:.cpp=.d}
DEPS := $(addprefix ${DEPSDIR},${DEPS})
DEPS := ${SRCS:.cpp=.d}
DEPS := $(addprefix ${DEPSDIR},${DEPS})
-WORKINGDIR := ../bin/
+CFGDIRNAME := configs/
+SRCCFGDIR := ../${CFGDIRNAME}
+DSTCFGDIR := ${WORKINGDIR}${CFGDIRNAME}
+
+CFGS := # := start
+CFGS += keys.cfg
+CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
+
TARGETNAME := run_physics
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
TARGETNAME := run_physics
TARGETTMP := ${OBJSDIR}${TARGETNAME}
TARGET := ${WORKINGDIR}${TARGETNAME}
-BLDDIRS := $(addprefix ${DEPSDIR},${DIRS}) $(addprefix ${OBJSDIR},${DIRS}) ${WORKINGDIR}
+DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
+BLDDIRS := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
VERBOSE := 0
VERBOSE := 0
@@
-57,31
+67,36
@@
else
endif
.PHONY: all
endif
.PHONY: all
-all: ${TARGET}
-
-# rule to copy tmp target to working directory
-${TARGET}: ${TARGETTMP}
- ${Q1}echo "cp: $@"
- ${Q2}cp $^ $@
+all: ${TARGET} ${CFGS}
# how to link the main target
${TARGETTMP}: ${OBJS}
${Q1}echo "${CXX}: $@"
${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
# how to link the main target
${TARGETTMP}: ${OBJS}
${Q1}echo "${CXX}: $@"
${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
+# rule to copy tmp target to working directory
+${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
+ ${Q1}echo "cp: $@"
+ ${Q2}cp $< $@
+
# how to make a directory
${BLDDIRS}:
${Q2}mkdir -p $@
# how to make a directory
${BLDDIRS}:
${Q2}mkdir -p $@
+# rule to make an object file from a .cpp
+${OBJSDIR}%.o: %.cpp | ${OBJSBLDDIRS}
+ ${Q1}echo "${CXX}: $@"
+ ${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+
# rule to make a depend file from a .cpp
# rule to make a depend file from a .cpp
-${DEPSDIR}%.d: %.cpp | ${BLDDIRS}
+${DEPSDIR}%.d: %.cpp | ${
DEPS
BLDDIRS}
${Q1}echo "DEP: $@"
${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
${Q1}echo "DEP: $@"
${Q2}${CXX} -MM ${CXXFLAGS} $< | sed 's,\(^.*\):,${OBJSDIR}\1 $@:,' > $@
-# rule to
make an object file from a .cpp
-${
OBJSDIR}%.o: %.cpp | ${BLDDIRS
}
- ${Q1}echo "
${CXX}
: $@"
- ${Q2}
${CXX} ${CXXFLAGS} -c -o $@ $<
+# rule to
copy the config files into the working directory
+${
DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR
}
+ ${Q1}echo "
cp
: $@"
+ ${Q2}
cp $< $@
tags: ${SRCS}
tags: ${SRCS}
@@
-148,7
+163,7
@@
MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \
"CXXFLAGS := ${OPTFLAGS}" \
"CXX := mingw32-g++" \
"OBJSDIR := ../objs-mingw32/" \
"CXXFLAGS := ${OPTFLAGS}" \
"CXX := mingw32-g++" \
"OBJSDIR := ../objs-mingw32/" \
- "WORKINGDIR := ../bin-mingw32" \
+ "WORKINGDIR := ../bin-mingw32
/
" \
"TARGETNAME := run_physics.exe"
.PHONY: mingw32
"TARGETNAME := run_physics.exe"
.PHONY: mingw32