physics setup to use local libbear

diff --git a/libs/bear.dll b/libs/bear.dll
deleted file mode 120000 (symlink)
index 03329c6..0000000
--- a/libs/bear.dll
+++ /dev/null
@@ -1 +0,0 @@
-/usr/mingw32/lib/bear.dll
\ No newline at end of file

diff --git a/libs/libbear.so.0 b/libs/libbear.so.0
deleted file mode 120000 (symlink)
index 5c6fb83..0000000
--- a/libs/libbear.so.0
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libbear.so.0
\ No newline at end of file

diff --git a/rules.mk b/rules.mk
index ac7ed7d..b7387de 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -5,6 +5,12 @@ all: ${TARGET_$P} ${CFGS_$P} ${LIBSTXT_$P} ${LIBSCPY_$P} ${TXT_$P}
 #${G_OBJS_TESTS}: ${L_OBJS_$P}
 #${G_DEPS_TESTS}: ${L_DEPS_$P}
 
+${TARGETTMP_$D}: ${BINDIR_$P}${SONAME_${G_LIB}}
+
+
+# how to copy a library to the tests bin directory
+${BINDIR_$P}${SONAME_${G_LIB}}: ${TARGET_${G_LIB}} | $${@D}
+       ${cmd-cp}
 
 # how to link the main target
 ${TARGETTMP_$P}: ${L_OBJS_$P} | $${@D}

diff --git a/src/bear b/src/bear
new file mode 120000 (symlink)
index 0000000..177c5ab
--- /dev/null
+++ b/src/bear
@@ -0,0 +1 @@
+../../lib/inc
\ No newline at end of file

diff --git a/tvars.mk b/tvars.mk
index 59015c1..e086b95 100644 (file)
--- a/tvars.mk
+++ b/tvars.mk
@@ -5,6 +5,11 @@ ${L_OBJS_$P} ${L_DEPS_$P}: INCFLAGS := ${INCFLAGS_$P}
              ${L_DEPS_$P}: DEPSDIR  := ${DEPSDIR_$P}
              ${L_DEPS_$P}: OBJSDIR  := ${OBJSDIR_$P}
 
+${TARGETTMP_$P}: CXX      := ${CXX_$P}
+${TARGETTMP_$P}: CXXFLAGS := ${CXXFLAGS_$P}
+${TARGETTMP_$P}: LNKFLAGS := ${LNKFLAGS_$P}
+${TARGETTMP_$P}: LIBS     := ${LIBS_$P}
+
 cleanbin-$P:    BINDIR      := ${BINDIR_$P}
 cleanobjs-$P:   OBJSDIR     := ${OBJSDIR_$P}
 cleandeps-$P:   DEPSDIR     := ${DEPSDIR_$P}

diff --git a/vars.mk b/vars.mk
index 3390067..18caeb3 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
-LIBS_$P     := ${G_LIBSDL} ${G_LIBGL} -lbear
+LIBS_$P     := ${G_LIBSDL} ${G_LIBGL}
 
 SRCSDIR_$P := ${CURDIR}${G_SRCSDIR}
 DEPSDIR_$P := ${CURDIR}${G_DEPSDIR}
@@ -39,10 +39,8 @@ LIBSTXT_$P     := $(addprefix ${DSTLIBSDIR_$P},${LIBSTXT_$P})
 LIBSCPY_$P     := # := start
 ifeq (${BUILD},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})