X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=9deb3c6abfbcdde9aca42ff3a90a2f66eb589d95;hb=f32a9b7c8eab3536ad354f85ee65c41d5b5da006;hp=e61452cfa564d26e02773cc45b0c6a85d8731296;hpb=4537196fcb623470c4c36990ad47b1c59172afb3;p=physics.git

diff --git a/Makefile b/Makefile
index e61452c..9deb3c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
 LIBGL  := -lGL -lGLU
 LIBSDL := `sdl-config --libs`
-LIBS   := ${LIBSDL} ${LIBGL}
+LIBS   := ${LIBSDL} ${LIBGL} -lpg
 
 OPTFLAGS := -O2
 DBGFLAGS := -ggdb
@@ -30,14 +30,34 @@ include ${SRCSDIR}${DIRMK}
 
 WORKINGDIR  := bind/
 
-CFGDIRNAME := configs/
-SRCCFGDIR  := ${CFGDIRNAME}
-DSTCFGDIR  := ${WORKINGDIR}${CFGDIRNAME}
+CFGDIRNAME  := configs/
+SRCCFGDIR   := ${CFGDIRNAME}
+DSTCFGDIR   := ${WORKINGDIR}${CFGDIRNAME}
 
 CFGS := # := start
 CFGS += keys.cfg
 CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
+SRCLIBSDIR  := libs/
+DSTLIBSDIR  := ${WORKINGDIR}
+
+LIBSTXT     := # := start
+LIBSTXT     += COPYING-SDL
+LIBSTXT     += README-SDL
+LIBSTXT     += VERSION-SDL
+LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
+
+LIBSCPY     := # := start
+LIBSCPY     += libSDL.so
+LIBSCPY     := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
+
+SRCTXTDIR   :=
+DSTTXTDIR   := ${WORKINGDIR}
+
+TXT         := # := start
+TXT         += COPYING
+TXT         := $(addprefix ${DSTTXTDIR},${TXT})
+
 TARGETNAME  := run_physics
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 TARGET      := ${WORKINGDIR}${TARGETNAME}
@@ -47,6 +67,7 @@ OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
 BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
 
 INCDIRS     := ${SRCSDIR}
+INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
 PRNTFMT := printf "%-5s: %s\n"
@@ -66,7 +87,10 @@ else
 endif
 
 .PHONY: all
-all: ${TARGET} ${CFGS}
+all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} ${TXT}
+
+# cause the fancy $$ directory rules to work out
+.SECONDEXPANSION:
 
 # how to link the main target
 ${TARGETTMP}: ${OBJS}
@@ -78,38 +102,43 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
 	${Q1}${PRNTFMT} "cp" "$@"
 	${Q2}cp $< $@
 
+# rule to copy the config files into the working directory
+${DSTCFGDIR}%: ${SRCCFGDIR}% | $$(dir $$@)
+	${Q1}${PRNTFMT} "cp" "$@"
+	${Q2}cp $< $@
+
+# rule to copy the library files into the working directory
+${DSTLIBSDIR}%: ${SRCLIBSDIR}% | $$(dir $$@)
+	${Q1}${PRNTFMT} "cp" "$@"
+	${Q2}cp $< $@
+
+# rule to copy the library files into the working directory
+${DSTTXTDIR}%: ${SRCTXTDIR}% | $$(dir $$@)
+	${Q1}${PRNTFMT} "cp" "$@"
+	${Q2}cp $< $@
+
 # how to make a directory
 ${BLDDIRS}:
 	${Q1}${PRNTFMT} "mkdir" "$@"
 	${Q2}mkdir -p $@
 
-#${SRCSDIR}%.cpp: ${SRCSDIR}%.h
-
-# cause the below directory rules to work out
-.SECONDEXPANSION:
-
 # 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 $@):/' > $@
 
-# rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
-	${Q1}${PRNTFMT} "cp" "$@"
-	${Q2}cp $< $@
-
-.PHONY: cleantargets
-cleantargets:
-	${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
-	${Q2}rm -f ${TARGET}
+.PHONY: cleanbin
+cleanbin:
+	${Q1}${PRNTFMT} "rm" "${WORKINGDIR}"
+	${Q2}rm -rf ${WORKINGDIR}
 
 .PHONY: cleanobjs
 cleanobjs:
@@ -122,10 +151,10 @@ cleandeps:
 	${Q2}rm -rf ${DEPSDIR}
 
 .PHONY: clean
-clean: cleantargets cleanobjs
+clean: cleanobjs
 
 .PHONY: cleanall
-cleanall: clean cleandeps
+cleanall: clean cleanbin cleandeps
 
 .PHONY: gitclean
 gitclean:
@@ -170,6 +199,7 @@ prof: run
 
 MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
                 "LIBSDL     := `/usr/mingw32/bin/sdl-config --libs`" \
+				"LIBSCPY    := $(addprefix bin-mingw32/,SDL.dll)" \
                 "CXXFLAGS   := ${OPTFLAGS}" \
                 "CXX        := mingw32-g++" \
                 "OBJSDIR    := objs-mingw32/" \
@@ -179,7 +209,8 @@ MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
 .PHONY: mingw32
 mingw32:
 	${Q1}${PRNTFMT} "make" "mingw32"
-	${Q2}${MAKE} ${MINGMAKEARGS} clean all
+	${Q2}${MAKE} ${MINGMAKEARGS} cleanbin cleanobjs
+	${Q2}${MAKE} ${MINGMAKEARGS} all
 
 FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
                  "OBJSDIR    := objs/" \
@@ -188,7 +219,8 @@ FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
 .PHONY: final
 final:
 	${Q1}${PRNTFMT} "make" "final"
-	${Q2}${MAKE} ${FINALMAKEARGS} clean all
+	${Q2}${MAKE} ${FINALMAKEARGS} cleanbin cleanobjs
+	${Q2}${MAKE} ${FINALMAKEARGS} all
 
 
 -include ${DEPS}