X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=6faa1dffaf8ce81bdf691484ecdda89f5650bb98;hb=b85b89ba9a2cb0373209e8117046fd308faf0202;hp=85ac1998c75b4121f6289a71cc4aa4ef27f208cb;hpb=70468808f161d45b9ae0eecf5d9d854a805bd855;p=physics.git

diff --git a/Makefile b/Makefile
index 85ac199..6faa1df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,128 @@
 
-LIBGL  := -lGL -lGLU
-LIBSDL := `sdl-config --libs`
-LIBS   := ${LIBSDL} ${LIBGL}
+# set this on the command line to 1 to get a windows 32 build
+WIN32    := 0
+
+# set this on the command line to 1 to get a final (none debug) build
+FINAL    := 0
+
+
+ifeq (${WIN32},1)
+    LIBGL   := -lopengl32 -lglu32
+    LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
+else
+    LIBGL   := -lGL -lGLU
+    LIBSDL  := `sdl-config --libs`
+endif
+LIBMY       := -lpg
+LIBS        := ${LIBSDL} ${LIBGL} ${LIBMY}
 
 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++
+ifeq (${WIN32},1)
+    CXXFLAGS    := ${OPTFLAGS}
+else ifeq (${FINAL},1)
+    CXXFLAGS    := ${OPTFLAGS}
+else
+    CXXFLAGS    := ${MYFLAGS} ${DBGFLAGS}
+endif
 
-DIRS := # := start
-DIRS += ./
-DIRS += Entities/
-DIRS += GameStates/
-DIRS += Effects/
-DIRS += config/
-DIRS += input/
-DIRS += graphics/
-DIRS += locks/
+ifeq (${WIN32},1)
+    CXX := mingw32-g++
+else
+    CXX := g++
+endif
+
+DIRS    := # := start
 
 SRCSDIR := src/
 SRCS    := # := start
 
-# include all of the dir.mk
-include $(addprefix ${SRCSDIR},$(addsuffix dir.mk,${DIRS}))
+ifeq (${WIN32},1)
+    OBJSDIR := objs-mingw32/
+else ifeq (${FINAL},1)
+    OBJSDIR := objs/
+else
+    OBJSDIR := objsd/
+endif
+OBJS        := # := start
 
-WORKINGDIR  := bind/
+DEPSDIR := deps/
+DEPS    := # := start
 
-OBJSDIR := objsd/
-OBJS    := ${SRCS:.cpp=.o}
-OBJS    := $(addprefix ${OBJSDIR},${OBJS})
+# include all of the dir.mk
+DIRMK   := dir.mk
+include ${SRCSDIR}${DIRMK}
 
-DEPSDIR := deps/
-DEPS    := ${SRCS:.cpp=.d}
-DEPS    := $(addprefix ${DEPSDIR},${DEPS})
+ifeq (${WIN32},1)
+    WORKINGDIR  := bin-mingw32/
+else ifeq (${FINAL},1)
+    WORKINGDIR  := bin/
+else
+    WORKINGDIR  := bind/
+endif
 
-CFGDIRNAME := configs/
-SRCCFGDIR  := ${CFGDIRNAME}
-DSTCFGDIR  := ${WORKINGDIR}${CFGDIRNAME}
+CFGDIRNAME  := configs/
+SRCCFGDIR   := ${CFGDIRNAME}
+DSTCFGDIR   := ${WORKINGDIR}${CFGDIRNAME}
 
 CFGS := # := start
 CFGS += keys.cfg
 CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
-TARGETNAME  := run_physics
+LIBSDIRNAME := libs/
+SRCLIBSDIR  := ${LIBSDIRNAME}
+DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
+
+LIBSTXT     := # := start
+LIBSTXT     += COPYING-SDL
+LIBSTXT     += README-SDL
+LIBSTXT     += VERSION-SDL
+LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
+
+LIBSCPY     := # := start
+ifeq (${WIN32},1)
+    LIBSCPY += SDL.dll
+else
+    LIBSCPY += libSDL-1.2.so.0
+    LIBSCPY += libpg.so.0
+endif
+LIBSCPY     := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
+
+SRCTXTDIR   :=
+DSTTXTDIR   := ${WORKINGDIR}
+
+TXT         := # := start
+TXT         += COPYING
+TXT         := $(addprefix ${DSTTXTDIR},${TXT})
+
+ifeq (${WIN32},1)
+    TARGETNAME  := run_physics.exe
+else
+    TARGETNAME  := run_physics
+endif
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 TARGET      := ${WORKINGDIR}${TARGETNAME}
 
-DEPSBLDDIRS := $(addprefix ${DEPSDIR},${DIRS})
-OBJSBLDDIRS := $(addprefix ${OBJSDIR},${DIRS})
-BLDDIRS     := ${OBJSBLDDIRS} ${DEPSBLDDIRS} ${WORKINGDIR} ${DSTCFGDIR}
+DEPSBLDDIRS := ${DEPSDIR} $(addprefix ${DEPSDIR},${DIRS})
+OBJSBLDDIRS := ${OBJSDIR} $(addprefix ${OBJSDIR},${DIRS})
+
+BLDDIRS     := # := start
+BLDDIRS     += ${OBJSBLDDIRS}
+BLDDIRS     += ${DEPSBLDDIRS}
+BLDDIRS     += ${WORKINGDIR}
+BLDDIRS     += ${DSTCFGDIR}
+BLDDIRS     += ${DSTLIBSDIR}
+
+INCDIRS     := ${SRCSDIR}
+INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
 PRNTFMT := printf "%-5s: %s\n"
@@ -61,71 +130,90 @@ PRNTFMT := printf "%-5s: %s\n"
 VERBOSE := 0
 
 ifeq (${VERBOSE},0)
-    # quiet the echo command
+    # quiet the printf command
     Q1 := @
     # quiet the command that is `replaced' by an echo
     Q2 := @
 else
-    # EAT the echo command as if it was not there
+    # EAT the printf command as if it was not there
     Q1 := @true # NOTE: the space between @true and the # is VERY important!!
     # do not quiet the command output
     Q2 :=
 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}
 	${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}
 	${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 $@
 
 # rule to make an object file from a .cpp
-${OBJSDIR}%.o: ${SRCSDIR}%.cpp | ${OBJSBLDDIRS}
+${OBJSDIR}%.o: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "${CXX}" "$@"
-	${Q2}${CXX} ${CXXFLAGS} -c -o $@ $<
+	${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 | ${DEPSBLDDIRS}
+${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
 	${Q1}${PRNTFMT} "DEP" "$@"
-	${Q2}${CXX} -MM ${CXXFLAGS} $< | \
+	${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \
 		sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
-# rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | ${DSTCFGDIR}
-	${Q1}${PRNTFMT} "cp" "$@"
-	${Q2}cp $< $@
-
+CLEANCMDS := cleanbin cleanobjs cleandeps clean cleanall
 
-tags: ${SRCS}
-	${Q1}${PRNTFMT} "ctags" "$@"
-	${Q2}ctags $^
+.PHONY: cleanbin
+cleanbin:
+	${Q1}${PRNTFMT} "rm" "${WORKINGDIR}"
+	${Q2}rm -rf ${WORKINGDIR}
 
-
-.PHONY: clean
-clean:
+.PHONY: cleanobjs
+cleanobjs:
 	${Q1}${PRNTFMT} "rm" "${OBJSDIR}"
 	${Q2}rm -rf ${OBJSDIR}
-	${Q1}${PRNTFMT} "rm" "${TARGET} ${TARGETTMP}"
-	${Q2}rm -f ${TARGET}
 
-.PHONY: distclean
-distclean: clean
+.PHONY: cleandeps
+cleandeps:
 	${Q1}${PRNTFMT} "rm" "${DEPSDIR}"
 	${Q2}rm -rf ${DEPSDIR}
-	${Q1}${PRNTFMT} "rm" "tags prof gmon.out"
-	${Q2}rm -f tags prof gmon.out
+
+.PHONY: clean
+clean: cleanobjs
+	${Q1}${PRNTFMT} "rm" "${TARGET}"
+	${Q2}rm -rf ${TARGET}
+
+.PHONY: cleanall
+cleanall: clean cleanbin cleandeps
 
 .PHONY: gitclean
 gitclean:
@@ -148,7 +236,11 @@ physics.tar.bz2:
 
 .PHONY: run
 run: all
+ifeq (${WIN32},1)
+	cd ${WORKINGDIR}; wine ${TARGETNAME}
+else
 	cd ${WORKINGDIR}; ./${TARGETNAME}
+endif
 
 .PHONY: gdb
 gdb: all
@@ -164,30 +256,11 @@ val: all
 
 .PHONY: prof
 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}" \
-                "CXX        := mingw32-g++" \
-                "OBJSDIR    := objs-mingw32/" \
-                "WORKINGDIR := bin-mingw32/" \
-                "TARGETNAME := run_physics.exe"
+	cd ${WORKINGDIR}; gprof -b ${TARGETNAME} > prof
+	cd ${WORKINGDIR}; kprof -f prof
 
-.PHONY: mingw32
-mingw32:
-	${Q1}${PRNTFMT} "make" "mingw32"
-	${Q2}${MAKE} ${MINGMAKEARGS} clean all
 
-FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
-                 "OBJSDIR    := objs/" \
-                 "WORKINGDIR := bin/"
-
-.PHONY: final
-final:
-	${Q1}${PRNTFMT} "make" "final"
-	${Q2}${MAKE} ${FINALMAKEARGS} clean all
-
--include ${DEPS}
+# Do not include deps files when doing a _single_ clean operation
+ifeq ($(findstring ${MAKECMDGOALS},${CLEANCMDS}),)
+    -include ${DEPS}
+endif