Makefile cleaning

diff --git a/Makefile b/Makefile
index 769b91d..8fb3377 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,9 @@
 
-# set this on the command line to 1 to get a windows 32 build
-WIN32    := 0
+# set this on the command line to get a WIN32 or a FINAL build
+BUILD    := DEBUG
 
-# set this on the command line to 1 to get a final (none debug) build
-FINAL    := 0
 
-
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     LIBGL   := -lopengl32 -lglu32
     LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
 else
@@ -26,17 +23,17 @@ RPATH    := libs/
 VALFLAGS := --leak-check=full
 LNKFLAGS := -Wl,-rpath,${RPATH}
 
-ifeq (${WIN32},1)
-    CXXFLAGS    := ${OPTFLAGS}
+ifeq (${BUILD},WIN32)
+    CXXFLAGS    := ${MYFLAGS} ${OPTFLAGS}
 else
-ifeq (${FINAL},1)
-    CXXFLAGS    := ${OPTFLAGS}
+ifeq (${BUILD},FINAL)
+    CXXFLAGS    := ${MYFLAGS} ${OPTFLAGS}
 else
     CXXFLAGS    := ${MYFLAGS} ${DBGFLAGS}
 endif
 endif
 
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     CXX := mingw32-g++
 else
     CXX := g++
@@ -47,10 +44,10 @@ DIRS    := # := start
 SRCSDIR := src/
 SRCS    := # := start
 
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     OBJSDIR := objs-mingw32/
 else
-ifeq (${FINAL},1)
+ifeq (${BUILD},FINAL)
     OBJSDIR := objs/
 else
     OBJSDIR := objsd/
@@ -65,10 +62,10 @@ DEPS    := # := start
 DIRMK   := dir.mk
 include ${SRCSDIR}${DIRMK}
 
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     WORKINGDIR  := bin-mingw32/
 else
-ifeq (${FINAL},1)
+ifeq (${BUILD},FINAL)
     WORKINGDIR  := bin/
 else
     WORKINGDIR  := bind/
@@ -85,7 +82,7 @@ CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
 
 LIBSDIRNAME := libs/
 SRCLIBSDIR  := ${LIBSDIRNAME}
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     DSTLIBSDIR  := ${WORKINGDIR}
 else
     DSTLIBSDIR  := ${WORKINGDIR}${LIBSDIRNAME}
@@ -98,7 +95,7 @@ LIBSTXT     += VERSION-SDL
 LIBSTXT     := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
 
 LIBSCPY     := # := start
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     LIBSCPY += SDL.dll
     LIBSCPY += pg.dll
 else
@@ -114,7 +111,7 @@ TXT         := # := start
 TXT         += COPYING
 TXT         := $(addprefix ${DSTTXTDIR},${TXT})
 
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     TARGETNAME  := run_physics.exe
 else
     TARGETNAME  := run_physics
@@ -137,7 +134,7 @@ INCDIRS     := ${SRCSDIR}
 INCFLAGS    := $(addprefix -I, ${INCDIRS})
 
 
-ifeq (${WIN32},1)
+ifeq (${BUILD},WIN32)
     PRNTFMT := printf "%-12s: %s\n"
 else
     PRNTFMT := printf "%-8s: %s\n"