From: Patrik Gornicz Date: Mon, 17 Nov 2008 03:46:56 +0000 (-0500) Subject: added final to make X-Git-Tag: physics-premerge~92 X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=commitdiff_plain;h=4e77f48b331eeab55f2dd58436fe47b734314bdc;p=libbear.git added final to make --- diff --git a/.gitignore b/.gitignore index 5c0b528..920a344 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ deps -objs -bin +objsd +bind objs-mingw32 bin-mingw32 + +objs +bin diff --git a/src/Makefile b/src/Makefile index 56bb7d6..10a1a16 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,7 +9,7 @@ PRFFLAGS := ${DBGFLAGS} -pg MYFLAGS := -Wall -pedantic -ansi VALFLAGS := --leak-check=full -CXXFLAGS := ${MYFLAGS} ${OPTFLAGS} +CXXFLAGS := ${MYFLAGS} ${DBGFLAGS} CXX := g++ @@ -25,9 +25,9 @@ DIRS += graphics/ SRCS := # := start include $(addsuffix /files.mk,${DIRS}) -WORKINGDIR := ../bin/ +WORKINGDIR := ../bind/ -OBJSDIR := ../objs/ +OBJSDIR := ../objsd/ OBJS := ${SRCS:.cpp=.o} OBJS := $(addprefix ${OBJSDIR},${OBJS}) @@ -158,6 +158,7 @@ prof: run cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > src/prof kprof -f prof + MINGMAKEARGS := "LIBGL := -lopengl32 -lglu32" \ "LIBSDL := `/usr/mingw32/bin/sdl-config --libs`" \ "CXXFLAGS := ${OPTFLAGS}" \ @@ -171,4 +172,13 @@ mingw32: ${Q1}echo "make: mingw32" ${Q2}${MAKE} ${MINGMAKEARGS} clean all +FINALMAKEARGS := "CXXFLAGS := ${OPTFLAGS}" \ + "OBJSDIR := ../objs/" \ + "WORKINGDIR := ../bin/" + +.PHONY: final +final: + ${Q1}echo "make: final" + ${Q2}${MAKE} ${FINALMAKEARGS} clean all + -include ${DEPS}