X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=fd0cfb466c60966b2107ce43d571e7ba90daaf9a;hb=7d8057c331d6ed190990b69cf251e062bc2d3126;hp=88dfc85d25dfe291fcbed3c75e811d6bdc9d7f5e;hpb=47b9b09edc66fc0822b7f9cf7623ae3a98430ff2;p=physics.git

diff --git a/Makefile b/Makefile
index 88dfc85..fd0cfb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,59 @@
 
-LIBGL  := -lGL -lGLU
-LIBSDL := `sdl-config --libs`
-LIBS   := ${LIBSDL} ${LIBGL}
+# set this on the command line to get a WIN32 or a FINAL build
+BUILD    := DEBUG
+
+
+ifeq (${BUILD},WIN32)
+    LIBGL   := -lopengl32 -lglu32
+    LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
+else
+    LIBGL   := -lGL -lGLU
+    LIBSDL  := `sdl-config --libs`
+endif
+LIBMY       := -lbear
+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}
+
+ifeq (${BUILD},WIN32)
+    CXXFLAGS    := ${MYFLAGS} ${OPTFLAGS}
+else
+ifeq (${BUILD},FINAL)
+    CXXFLAGS    := ${MYFLAGS} ${OPTFLAGS}
+else
+    CXXFLAGS    := ${MYFLAGS} ${DBGFLAGS}
+endif
+endif
 
-CXX := g++
+ifeq (${BUILD},WIN32)
+    CXX := mingw32-g++
+else
+    CXX := g++
+endif
 
-DIRS := # := start
+DIRS    := # := start
 
 SRCSDIR := src/
 SRCS    := # := start
 
-OBJSDIR := objsd/
-OBJS    := # := start
+ifeq (${BUILD},WIN32)
+    OBJSDIR := objs-mingw32/
+else
+ifeq (${BUILD},FINAL)
+    OBJSDIR := objs/
+else
+    OBJSDIR := objsd/
+endif
+endif
+OBJS        := # := start
 
 DEPSDIR := deps/
 DEPS    := # := start
@@ -28,7 +62,15 @@ DEPS    := # := start
 DIRMK   := dir.mk
 include ${SRCSDIR}${DIRMK}
 
-WORKINGDIR  := bind/
+ifeq (${BUILD},WIN32)
+    WORKINGDIR  := bin-mingw32/
+else
+ifeq (${BUILD},FINAL)
+    WORKINGDIR  := bin/
+else
+    WORKINGDIR  := bind/
+endif
+endif
 
 CFGDIRNAME  := configs/
 SRCCFGDIR   := ${CFGDIRNAME}
@@ -38,31 +80,65 @@ CFGS := # := start
 CFGS += keys.cfg
 CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
-SRCLIBSDIR  := libs/
-DSTLIBSDIR  := ${WORKINGDIR}
+LIBSDIRNAME := libs/
+SRCLIBSDIR  := ${LIBSDIRNAME}
+ifeq (${BUILD},WIN32)
+    DSTLIBSDIR  := ${WORKINGDIR}
+else
+    DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
+endif
 
-LIBSTXT    := # := start
-LIBSTXT    += COPYING-SDL
-LIBSTXT    += README-SDL
-LIBSTXT    += VERSION-SDL
-LIBSTXT    := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
+LIBSTXT     := # := start
+LIBSTXT     += COPYING-SDL
+LIBSTXT     += README-SDL
+LIBSTXT     += VERSION-SDL
+LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
 
-LIBSCPY    := # := start
-LIBSCPY    += libSDL.so
-LIBSCPY    := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
+LIBSCPY     := # := start
+ifeq (${BUILD},WIN32)
+    LIBSCPY += SDL.dll
+    LIBSCPY += bear.dll
+else
+    LIBSCPY += libSDL-1.2.so.0
+    LIBSCPY += libbear.so.0
+endif
+LIBSCPY     := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
+
+SRCTXTDIR   :=
+DSTTXTDIR   := ${WORKINGDIR}
+
+TXT         := # := start
+TXT         += COPYING
+TXT         := $(addprefix ${DSTTXTDIR},${TXT})
 
-TARGETNAME  := run_physics
+ifeq (${BUILD},WIN32)
+    TARGETNAME  := run_physics.exe
+else
+    TARGETNAME  := run_physics
+endif
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 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}
+BLDDIRS     := $(sort ${BLDDIRS}) # remove possible duplicates
 
 INCDIRS     := ${SRCSDIR}
+INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
-PRNTFMT := printf "%-5s: %s\n"
+ifeq (${BUILD},WIN32)
+    PRNTFMT := printf "%-12s: %s\n"
+else
+    PRNTFMT := printf "%-8s: %s\n"
+endif
 
 VERBOSE := 0
 
@@ -79,7 +155,7 @@ else
 endif
 
 .PHONY: all
-all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY}
+all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY} ${TXT}
 
 # cause the fancy $$ directory rules to work out
 .SECONDEXPANSION:
@@ -87,7 +163,7 @@ all: ${TARGET} ${CFGS} ${LIBSTXT} ${LIBSCPY}
 # 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}
@@ -95,7 +171,7 @@ ${TARGET}: ${TARGETTMP} | ${WORKINGDIR}
 	${Q2}cp $< $@
 
 # rule to copy the config files into the working directory
-${DSTCFGDIR}%.cfg: ${SRCCFGDIR}%.cfg | $$(dir $$@)
+${DSTCFGDIR}%: ${SRCCFGDIR}% | $$(dir $$@)
 	${Q1}${PRNTFMT} "cp" "$@"
 	${Q2}cp $< $@
 
@@ -104,6 +180,11 @@ ${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" "$@"
@@ -112,20 +193,17 @@ ${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: cleantarget
-cleantarget:
-	${Q1}${PRNTFMT} "rm" "${TARGET}"
-	${Q2}rm -f ${TARGET}
+CLEANCMDS := cleanbin cleanobjs cleandeps clean cleanall
 
 .PHONY: cleanbin
 cleanbin:
@@ -144,6 +222,8 @@ cleandeps:
 
 .PHONY: clean
 clean: cleanobjs
+	${Q1}${PRNTFMT} "rm" "${TARGET}"
+	${Q2}rm -rf ${TARGET}
 
 .PHONY: cleanall
 cleanall: clean cleanbin cleandeps
@@ -169,7 +249,11 @@ physics.tar.bz2:
 
 .PHONY: run
 run: all
+ifeq (${WIN32},1)
+	cd ${WORKINGDIR}; wine ${TARGETNAME}
+else
 	cd ${WORKINGDIR}; ./${TARGETNAME}
+endif
 
 .PHONY: gdb
 gdb: all
@@ -189,28 +273,7 @@ prof: run
 	cd ${WORKINGDIR}; kprof -f prof
 
 
-MINGMAKEARGS := "LIBGL      := -lopengl32 -lglu32" \
-                "LIBSDL     := `/usr/mingw32/bin/sdl-config --libs`" \
-				"LIBSCPY    := $(addprefix ${DSTLIBSDIR},SDL.dll)" \
-                "CXXFLAGS   := ${OPTFLAGS}" \
-                "CXX        := mingw32-g++" \
-                "OBJSDIR    := objs-mingw32/" \
-                "WORKINGDIR := bin-mingw32/" \
-                "TARGETNAME := run_physics.exe"
-
-.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