projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed Mutex to Lock
[physics.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6faa1df
..
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
LIBGL := -lopengl32 -lglu32
LIBSDL := `/usr/mingw32/bin/sdl-config --libs`
else
@@
-26,15
+23,17
@@
RPATH := libs/
VALFLAGS := --leak-check=full
LNKFLAGS := -Wl,-rpath,${RPATH}
VALFLAGS := --leak-check=full
LNKFLAGS := -Wl,-rpath,${RPATH}
-ifeq (${WIN32},1)
- CXXFLAGS := ${OPTFLAGS}
-else ifeq (${FINAL},1)
- CXXFLAGS := ${OPTFLAGS}
+ifeq (${BUILD},WIN32)
+ CXXFLAGS := ${MYFLAGS} ${OPTFLAGS}
+else
+ifeq (${BUILD},FINAL)
+ CXXFLAGS := ${MYFLAGS} ${OPTFLAGS}
else
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
endif
else
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
endif
+endif
-ifeq (${
WIN32},1
)
+ifeq (${
BUILD},WIN32
)
CXX := mingw32-g++
else
CXX := g++
CXX := mingw32-g++
else
CXX := g++
@@
-45,13
+44,15
@@
DIRS := # := start
SRCSDIR := src/
SRCS := # := start
SRCSDIR := src/
SRCS := # := start
-ifeq (${
WIN32},1
)
+ifeq (${
BUILD},WIN32
)
OBJSDIR := objs-mingw32/
OBJSDIR := objs-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${BUILD},FINAL)
OBJSDIR := objs/
else
OBJSDIR := objsd/
endif
OBJSDIR := objs/
else
OBJSDIR := objsd/
endif
+endif
OBJS := # := start
DEPSDIR := deps/
OBJS := # := start
DEPSDIR := deps/
@@
-61,13
+62,15
@@
DEPS := # := start
DIRMK := dir.mk
include ${SRCSDIR}${DIRMK}
DIRMK := dir.mk
include ${SRCSDIR}${DIRMK}
-ifeq (${
WIN32},1
)
+ifeq (${
BUILD},WIN32
)
WORKINGDIR := bin-mingw32/
WORKINGDIR := bin-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${BUILD},FINAL)
WORKINGDIR := bin/
else
WORKINGDIR := bind/
endif
WORKINGDIR := bin/
else
WORKINGDIR := bind/
endif
+endif
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}
@@
-79,7
+82,11
@@
CFGS := $(addprefix ${DSTCFGDIR},${CFGS})
LIBSDIRNAME := libs/
SRCLIBSDIR := ${LIBSDIRNAME}
LIBSDIRNAME := libs/
SRCLIBSDIR := ${LIBSDIRNAME}
-DSTLIBSDIR := ${WORKINGDIR}${LIBSDIRNAME}
+ifeq (${BUILD},WIN32)
+ DSTLIBSDIR := ${WORKINGDIR}
+else
+ DSTLIBSDIR := ${WORKINGDIR}${LIBSDIRNAME}
+endif
LIBSTXT := # := start
LIBSTXT += COPYING-SDL
LIBSTXT := # := start
LIBSTXT += COPYING-SDL
@@
-88,8
+95,9
@@
LIBSTXT += VERSION-SDL
LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
LIBSCPY := # := start
LIBSTXT := $(addprefix ${DSTLIBSDIR},${LIBSTXT})
LIBSCPY := # := start
-ifeq (${
WIN32},1
)
+ifeq (${
BUILD},WIN32
)
LIBSCPY += SDL.dll
LIBSCPY += SDL.dll
+ LIBSCPY += pg.dll
else
LIBSCPY += libSDL-1.2.so.0
LIBSCPY += libpg.so.0
else
LIBSCPY += libSDL-1.2.so.0
LIBSCPY += libpg.so.0
@@
-103,7
+111,7
@@
TXT := # := start
TXT += COPYING
TXT := $(addprefix ${DSTTXTDIR},${TXT})
TXT += COPYING
TXT := $(addprefix ${DSTTXTDIR},${TXT})
-ifeq (${
WIN32},1
)
+ifeq (${
BUILD},WIN32
)
TARGETNAME := run_physics.exe
else
TARGETNAME := run_physics
TARGETNAME := run_physics.exe
else
TARGETNAME := run_physics
@@
-120,12
+128,17
@@
BLDDIRS += ${DEPSBLDDIRS}
BLDDIRS += ${WORKINGDIR}
BLDDIRS += ${DSTCFGDIR}
BLDDIRS += ${DSTLIBSDIR}
BLDDIRS += ${WORKINGDIR}
BLDDIRS += ${DSTCFGDIR}
BLDDIRS += ${DSTLIBSDIR}
+BLDDIRS := $(sort ${BLDDIRS}) # remove possible duplicates
INCDIRS := ${SRCSDIR}
INCFLAGS := $(addprefix -I, ${INCDIRS})
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
VERBOSE := 0