X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=vars.mk;h=de8996b0fd290eabadc8840841bac6a156774257;hb=HEAD;hp=3390067284521fae84433e7270c30db2e8a7540d;hpb=6d8ae4070f65c0c2571556cbc8742bdda8011f43;p=physics.git

diff --git a/vars.mk b/vars.mk
index 3390067..de8996b 100644
--- a/vars.mk
+++ b/vars.mk
@@ -2,61 +2,59 @@
 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}
-OBJSDIR_$P := ${CURDIR}${G_OBJSDIR}
-BINDIR_$P  := ${CURDIR}${G_BINDIR}
+SRCSDIR_$P := ${CURDIR}/${G_SRCSDIR}
+DEPSDIR_$P := ${CURDIR}/${G_DEPSDIR}
+OBJSDIR_$P := ${CURDIR}/${G_OBJSDIR}
+BINDIR_$P  := ${CURDIR}/${G_BINDIR}
 
 # HACK
-T_INCDIRS_$P := ${SRCSDIR_$P} # lib/inc/
+T_INCDIRS_$P := ${SRCSDIR_$P} lib/include
     INCFLAGS_$P  := $(addprefix -I, ${T_INCDIRS_$P})
 T_INCDIRS_$P := # empty
 
-CFGDIRNAME_$P  := configs/
-SRCCFGDIR_$P   := ${CURDIR}${CFGDIRNAME_$P}
-DSTCFGDIR_$P   := ${BINDIR_$P}${CFGDIRNAME_$P}
+CFGDIRNAME_$P  := configs
+SRCCFGDIR_$P   := ${CURDIR}/${CFGDIRNAME_$P}
+DSTCFGDIR_$P   := ${BINDIR_$P}/${CFGDIRNAME_$P}
 
 CFGS_$P := # := start
 CFGS_$P += keys.cfg
-CFGS_$P := $(addprefix ${DSTCFGDIR_$P},${CFGS_$P})
+CFGS_$P := $(addprefix ${DSTCFGDIR_$P}/,${CFGS_$P})
 
-LIBSDIRNAME_$P := libs/
-SRCLIBSDIR_$P  := ${CURDIR}${LIBSDIRNAME_$P}
-ifeq (${BUILD},WIN32)
+LIBSDIRNAME_$P := libs
+SRCLIBSDIR_$P  := ${CURDIR}/${LIBSDIRNAME_$P}
+ifeq (${G_BUILD},${B_WIN32})
     DSTLIBSDIR_$P  := ${BINDIR_$P}
 else
-    DSTLIBSDIR_$P  := ${BINDIR_$P}${LIBSDIRNAME_$P}
+    DSTLIBSDIR_$P  := ${BINDIR_$P}/${LIBSDIRNAME_$P}
 endif
 
 LIBSTXT_$P     := # := start
 LIBSTXT_$P     += COPYING-SDL
 LIBSTXT_$P     += README-SDL
 LIBSTXT_$P     += VERSION-SDL
-LIBSTXT_$P     := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P})
+LIBSTXT_$P     := $(addprefix ${DSTLIBSDIR_$P}/,${LIBSTXT_$P})
 
 LIBSCPY_$P     := # := start
-ifeq (${BUILD},WIN32)
+ifeq (${G_BUILD},${B_WIN32})
     LIBSCPY_$P += SDL.dll
-    LIBSCPY_$P += bear.dll
 else
     LIBSCPY_$P += libSDL-1.2.so.0
-    LIBSCPY_$P += libbear.so.0
 endif
-LIBSCPY_$P     := $(addprefix ${DSTLIBSDIR_$P},${LIBSCPY_$P})
+LIBSCPY_$P     := $(addprefix ${DSTLIBSDIR_$P}/,${LIBSCPY_$P})
 
 SRCTXTDIR_$P   := ${CURDIR}
 DSTTXTDIR_$P   := ${BINDIR_$P}
 
 TXT_$P         := # := start
 TXT_$P         += COPYING
-TXT_$P         := $(addprefix ${DSTTXTDIR_$P},${TXT_$P})
+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
 endif
-TARGETTMP_$P   := ${OBJSDIR_$P}${TARGETNAME_$P}
-TARGET_$P      := ${BINDIR_$P}${TARGETNAME_$P}
+TARGETTMP_$P   := ${OBJSDIR_$P}/${TARGETNAME_$P}
+TARGET_$P      := ${BINDIR_$P}/${TARGETNAME_$P}