X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=vars.mk;h=573f756119d3fe2b29a66db6e822c7aa1cace953;hb=6f4fcfeea395ef9d5a053737770be580a1ce6406;hp=18caeb3607a3abd7c160f2eedcefe37639c8f25e;hpb=c569b5d1b05f471fb5d89d0ed9aea5c4fffe4eb3;p=physics.git diff --git a/vars.mk b/vars.mk index 18caeb3..573f756 100644 --- a/vars.mk +++ b/vars.mk @@ -10,7 +10,7 @@ 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 @@ -24,7 +24,7 @@ CFGS_$P := $(addprefix ${DSTCFGDIR_$P},${CFGS_$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} @@ -37,7 +37,7 @@ LIBSTXT_$P += VERSION-SDL LIBSTXT_$P := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P}) LIBSCPY_$P := # := start -ifeq (${BUILD},WIN32) +ifeq (${G_BUILD},${B_WIN32}) LIBSCPY_$P += SDL.dll else LIBSCPY_$P += libSDL-1.2.so.0 @@ -51,7 +51,7 @@ TXT_$P := # := start 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