X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=f7e490d1b34032e89d654a7f819f21b1b3678bbc;hb=00820fda063af0630b90eaf3e4e83898a6c8d928;hp=1b6a3c68f0c148f69ac73ccb0619e4485e90524d;hpb=bcd46b8f4ee0d9b5ed6d983793f962ff66efa3aa;p=physics.git

diff --git a/Makefile b/Makefile
index 1b6a3c6..f7e490d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,22 @@
 
-LIBGL  := -lGL -lGLU
-LIBSDL := `sdl-config --libs`
-LIBS   := ${LIBSDL} ${LIBGL}
+LIBGL    := -lGL -lGLU
+LIBSDL   := `sdl-config --libs`
+LIBS     := ${LIBSDL} ${LIBGL} -lpg
 
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
 PRFFLAGS := ${DBGFLAGS} -pg
 MYFLAGS  := -Wall -pedantic -ansi
 
+RPATH    := libs/
+
 VALFLAGS := --leak-check=full
 CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
+LNKFLAGS := -Wl,-rpath,${RPATH}
 
-CXX := g++
+CXX      := g++
 
-DIRS := # := start
+DIRS    := # := start
 
 SRCSDIR := src/
 SRCS    := # := start
@@ -38,8 +41,9 @@ CFGS := # := start
 CFGS += keys.cfg
 CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
-SRCLIBSDIR  := libs/
-DSTLIBSDIR  := ${WORKINGDIR}
+LIBSDIRNAME := libs/
+SRCLIBSDIR  := ${LIBSDIRNAME}
+DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
 
 LIBSTXT     := # := start
 LIBSTXT     += COPYING-SDL
@@ -48,7 +52,8 @@ LIBSTXT     += VERSION-SDL
 LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
 
 LIBSCPY     := # := start
-LIBSCPY     += libSDL.so
+LIBSCPY     += libSDL-1.2.so.0
+LIBSCPY     += libpg.so.0
 LIBSCPY     := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
 
 SRCTXTDIR   :=
@@ -64,9 +69,16 @@ TARGET      := ${WORKINGDIR}${TARGETNAME}
 
 DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
 OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
-BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
+
+BLDDIRS     := # := start
+BLDDIRS     += ${OBJSBLDDIRS}
+BLDDIRS     += ${DEPSBLDDIRS}
+BLDDIRS     += ${WORKINGDIR}
+BLDDIRS     += ${DSTCFGDIR}
+BLDDIRS     += ${DSTLIBSDIR}
 
 INCDIRS     := ${SRCSDIR}
+INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
 PRNTFMT := printf "%-5s: %s\n"
@@ -94,7 +106,7 @@ all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} ${TXT}
 # how to link the main target
 ${TARGETTMP}: ${OBJS}
 	${Q1}${PRNTFMT} "${CXX}" "$@"
-	${Q2}${CXX} ${CXXFLAGS} -o $@ $^ ${LIBS}
+	${Q2}${CXX} ${CXXFLAGS} ${LNKFLAGS} -o $@ $^ ${LIBS}
 
 # rule to copy tmp target to working directory
 ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
@@ -124,14 +136,14 @@ ${BLDDIRS}:
 # rule to make an object file from a .cpp
 ${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "${CXX}" "$@"
-	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< -I "${INCDIRS}"
+	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $< ${INCFLAGS}
 
 # 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} $< -I "${INCDIRS}" | \
+	${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \
 		sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
 .PHONY: cleanbin