projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
created function include varibles F_
[physics.git]
/
vars.mk
diff --git
a/vars.mk
b/vars.mk
index
3390067
..
f7457f8
100644
(file)
--- a/
vars.mk
+++ b/
vars.mk
@@
-2,7
+2,7
@@
CXX_$P := ${G_CXX}
CXXFLAGS_$P := ${G_CXXFLAGS}
LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,libs/ -rdynamic
CXX_$P := ${G_CXX}
CXXFLAGS_$P := ${G_CXXFLAGS}
LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,libs/ -rdynamic
-LIBS_$P := ${G_LIBSDL} ${G_LIBGL}
-lbear
+LIBS_$P := ${G_LIBSDL} ${G_LIBGL}
SRCSDIR_$P := ${CURDIR}${G_SRCSDIR}
DEPSDIR_$P := ${CURDIR}${G_DEPSDIR}
SRCSDIR_$P := ${CURDIR}${G_SRCSDIR}
DEPSDIR_$P := ${CURDIR}${G_DEPSDIR}
@@
-24,7
+24,7
@@
CFGS_$P := $(addprefix ${DSTCFGDIR_$P},${CFGS_$P})
LIBSDIRNAME_$P := libs/
SRCLIBSDIR_$P := ${CURDIR}${LIBSDIRNAME_$P}
LIBSDIRNAME_$P := libs/
SRCLIBSDIR_$P := ${CURDIR}${LIBSDIRNAME_$P}
-ifeq (${
BUILD},WIN32
)
+ifeq (${
G_BUILD},${B_WIN32}
)
DSTLIBSDIR_$P := ${BINDIR_$P}
else
DSTLIBSDIR_$P := ${BINDIR_$P}${LIBSDIRNAME_$P}
DSTLIBSDIR_$P := ${BINDIR_$P}
else
DSTLIBSDIR_$P := ${BINDIR_$P}${LIBSDIRNAME_$P}
@@
-37,12
+37,10
@@
LIBSTXT_$P += VERSION-SDL
LIBSTXT_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P})
LIBSCPY_$P := # := start
LIBSTXT_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P})
LIBSCPY_$P := # := start
-ifeq (${
BUILD},WIN32
)
+ifeq (${
G_BUILD},${B_WIN32}
)
LIBSCPY_$P += SDL.dll
LIBSCPY_$P += SDL.dll
- LIBSCPY_$P += bear.dll
else
LIBSCPY_$P += libSDL-1.2.so.0
else
LIBSCPY_$P += libSDL-1.2.so.0
- LIBSCPY_$P += libbear.so.0
endif
LIBSCPY_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSCPY_$P})
endif
LIBSCPY_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSCPY_$P})
@@
-53,7
+51,7
@@
TXT_$P := # := start
TXT_$P += COPYING
TXT_$P := $(addprefix ${DSTTXTDIR_$P},${TXT_$P})
TXT_$P += COPYING
TXT_$P := $(addprefix ${DSTTXTDIR_$P},${TXT_$P})
-ifeq (${
BUILD},WIN32
)
+ifeq (${
G_BUILD},${B_WIN32}
)
TARGETNAME_$P := run_physics.exe
else
TARGETNAME_$P := run_physics
TARGETNAME_$P := run_physics.exe
else
TARGETNAME_$P := run_physics