projects
/
physics.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57b14b4
)
changed else ifeq so a lesser make can handle it
author
Patrik Gornicz
<Gornicz.P@gmail.com>
Sat, 2 May 2009 18:52:42 +0000
(14:52 -0400)
committer
Patrik Gornicz
<Gornicz.P@gmail.com>
Sat, 2 May 2009 18:52:42 +0000
(14:52 -0400)
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
6faa1df
..
9b5a2f6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-28,11
+28,13
@@
LNKFLAGS := -Wl,-rpath,${RPATH}
ifeq (${WIN32},1)
CXXFLAGS := ${OPTFLAGS}
ifeq (${WIN32},1)
CXXFLAGS := ${OPTFLAGS}
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
CXXFLAGS := ${OPTFLAGS}
else
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
endif
CXXFLAGS := ${OPTFLAGS}
else
CXXFLAGS := ${MYFLAGS} ${DBGFLAGS}
endif
+endif
ifeq (${WIN32},1)
CXX := mingw32-g++
ifeq (${WIN32},1)
CXX := mingw32-g++
@@
-47,11
+49,13
@@
SRCS := # := start
ifeq (${WIN32},1)
OBJSDIR := objs-mingw32/
ifeq (${WIN32},1)
OBJSDIR := objs-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
OBJSDIR := objs/
else
OBJSDIR := objsd/
endif
OBJSDIR := objs/
else
OBJSDIR := objsd/
endif
+endif
OBJS := # := start
DEPSDIR := deps/
OBJS := # := start
DEPSDIR := deps/
@@
-63,11
+67,13
@@
include ${SRCSDIR}${DIRMK}
ifeq (${WIN32},1)
WORKINGDIR := bin-mingw32/
ifeq (${WIN32},1)
WORKINGDIR := bin-mingw32/
-else ifeq (${FINAL},1)
+else
+ifeq (${FINAL},1)
WORKINGDIR := bin/
else
WORKINGDIR := bind/
endif
WORKINGDIR := bin/
else
WORKINGDIR := bind/
endif
+endif
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}
CFGDIRNAME := configs/
SRCCFGDIR := ${CFGDIRNAME}