Merge branch 'master' into libpg

Conflicts:
	Makefile

diff --git a/Makefile b/Makefile
index f7e490d..6faa1df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,20 @@
 
-LIBGL    := -lGL -lGLU
-LIBSDL   := `sdl-config --libs`
-LIBS     := ${LIBSDL} ${LIBGL} -lpg
+# 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
@@ -11,18 +24,35 @@ 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
+
+ifeq (${WIN32},1)
+    CXX := mingw32-g++
+else
+    CXX := g++
+endif
 
 DIRS    := # := start
 
 SRCSDIR := src/
 SRCS    := # := start
 
-OBJSDIR := objsd/
-OBJS    := # := start
+ifeq (${WIN32},1)
+    OBJSDIR := objs-mingw32/
+else ifeq (${FINAL},1)
+    OBJSDIR := objs/
+else
+    OBJSDIR := objsd/
+endif
+OBJS        := # := start
 
 DEPSDIR := deps/
 DEPS    := # := start
@@ -31,7 +61,13 @@ DEPS    := # := start
 DIRMK   := dir.mk
 include ${SRCSDIR}${DIRMK}
 
-WORKINGDIR  := bind/
+ifeq (${WIN32},1)
+    WORKINGDIR  := bin-mingw32/
+else ifeq (${FINAL},1)
+    WORKINGDIR  := bin/
+else
+    WORKINGDIR  := bind/
+endif
 
 CFGDIRNAME  := configs/
 SRCCFGDIR   := ${CFGDIRNAME}
@@ -52,8 +88,12 @@ LIBSTXT     += VERSION-SDL
 LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
 
 LIBSCPY     := # := start
-LIBSCPY     += libSDL-1.2.so.0
-LIBSCPY     += libpg.so.0
+ifeq (${WIN32},1)
+    LIBSCPY += SDL.dll
+else
+    LIBSCPY += libSDL-1.2.so.0
+    LIBSCPY += libpg.so.0
+endif
 LIBSCPY     := $(addprefix ${DSTLIBSDIR},${LIBSCPY})
 
 SRCTXTDIR   :=
@@ -63,7 +103,11 @@ TXT         := # := start
 TXT         += COPYING
 TXT         := $(addprefix ${DSTTXTDIR},${TXT})
 
-TARGETNAME  := run_physics
+ifeq (${WIN32},1)
+    TARGETNAME  := run_physics.exe
+else
+    TARGETNAME  := run_physics
+endif
 TARGETTMP   := ${OBJSDIR}${TARGETNAME}
 TARGET      := ${WORKINGDIR}${TARGETNAME}
 
@@ -146,6 +190,8 @@ ${DEPSDIR}%.d: ${SRCSDIR}%.cpp | $$(dir $$@)
        ${Q2}${CXX} -MM ${CXXFLAGS} $< ${INCFLAGS} | \
                sed 's/\(^.*\):/$(subst /,\/,${OBJSDIR}\1 $@):/' > $@
 
+CLEANCMDS := cleanbin cleanobjs cleandeps clean cleanall
+
 .PHONY: cleanbin
 cleanbin:
        ${Q1}${PRNTFMT} "rm" "${WORKINGDIR}"
@@ -163,6 +209,8 @@ cleandeps:
 
 .PHONY: clean
 clean: cleanobjs
+       ${Q1}${PRNTFMT} "rm" "${TARGET}"
+       ${Q2}rm -rf ${TARGET}
 
 .PHONY: cleanall
 cleanall: clean cleanbin cleandeps
@@ -188,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
@@ -208,30 +260,7 @@ prof: run
        cd ${WORKINGDIR}; kprof -f prof
 
 
-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/" \
-                "WORKINGDIR := bin-mingw32/" \
-                "TARGETNAME := run_physics.exe"
-
-.PHONY: mingw32
-mingw32:
-       ${Q1}${PRNTFMT} "make" "mingw32"
-       ${Q2}${MAKE} ${MINGMAKEARGS} cleanbin cleanobjs
-       ${Q2}${MAKE} ${MINGMAKEARGS} all
-
-FINALMAKEARGS := "CXXFLAGS   := ${OPTFLAGS}" \
-                 "OBJSDIR    := objs/" \
-                 "WORKINGDIR := bin/"
-
-.PHONY: final
-final:
-       ${Q1}${PRNTFMT} "make" "final"
-       ${Q2}${MAKE} ${FINALMAKEARGS} cleanbin cleanobjs
-       ${Q2}${MAKE} ${FINALMAKEARGS} all
-
-
--include ${DEPS}
+# Do not include deps files when doing a _single_ clean operation
+ifeq ($(findstring ${MAKECMDGOALS},${CLEANCMDS}),)
+    -include ${DEPS}
+endif