created global lib varibles

diff --git a/lib/vars.mk b/lib/vars.mk
index fffd6a0..0969478 100644 (file)
--- a/lib/vars.mk
+++ b/lib/vars.mk
@@ -1,6 +1,7 @@
 
 CXX_$P      := ${G_CXX}
 CXXFLAGS_$P := ${G_CXXFLAGS} -fPIC
+LIBS_$P     := ${G_LIBSDL} ${G_LIBGL}
 
 SRCSDIR_$P := ${CURDIR}src/
 DEPSDIR_$P := ${CURDIR}deps/
@@ -32,19 +33,6 @@ endif
 
 
 ifeq (${BUILD},WIN32)
-    T_LIBGL_$P   := -lopengl32 -lglu32
-    T_LIBSDL_$P  := `/usr/mingw32/bin/sdl-config --libs`
-else
-    T_LIBGL_$P   := -lGL -lGLU
-    T_LIBSDL_$P  := `sdl-config --libs`
-endif
-LIBS_$P        := ${T_LIBSDL_$P} ${T_LIBGL_$P}
-
-T_LIBGL_$P   :=
-T_LIBSDL_$P  :=
-
-
-ifeq (${BUILD},WIN32)
     LINKERNAME_$P  := bear.dll
     SONAME_$P      := bear.dll
     REALNAME_$P    := bear.dll
@@ -54,20 +42,8 @@ else
     REALNAME_$P    := libbear.so.0.0
 endif
 
-LNKFLAGS_$P := -shared -Wl,-soname,${SONAME_$P}
+LNKFLAGS_$P := ${G_LNKFLAGS} -shared -Wl,-soname,${SONAME_$P}
 
 TARGETTMP_$P   := ${OBJSDIR_$P}${REALNAME_$P}
 TARGET_$P      := ${WORKINGDIR_$P}${REALNAME_$P}
 
-
-ifeq (${BUILD},WIN32)
-    prefix      := /usr/mingw32
-else
-    prefix      := /usr
-endif
-exec_prefix := ${prefix}
-includedir  := ${prefix}/include
-libdir      := ${exec_prefix}/lib
-INSTALL     := install
-
-

diff --git a/tests/vars.mk b/tests/vars.mk
index a337043..2b47ca9 100644 (file)
--- a/tests/vars.mk
+++ b/tests/vars.mk
@@ -2,20 +2,12 @@
 CXX_$P      := ${G_CXX}
 CXXFLAGS_$P := ${G_CXXFLAGS}
 LNKFLAGS_$P := ${G_LNKFLAGS} -Wl,-rpath,./ -rdynamic
+LIBS_$P     := ${G_LIBSDL} ${G_LIBGL}
 
 T_INCDIRS_$P := lib/inc/
     INCFLAGS_$P  := $(addprefix -I, ${T_INCDIRS_$P})
 T_INCDIRS_$P := # empty
 
-LIBS_$P     :=
-ifeq (${BUILD},WIN32)
-    LIBS_$P += -lopengl32 -lglu32
-    LIBS_$P += `/usr/mingw32/bin/sdl-config --libs`
-else
-    LIBS_$P += -lGL -lGLU
-    LIBS_$P += `sdl-config --libs`
-endif
-
 
 SRCSDIR_$P  := ${CURDIR}src/
 DEPSDIR_$P  := ${CURDIR}deps/

diff --git a/vars.mk b/vars.mk
index 58fb8d4..b1fc660 100644 (file)
--- a/vars.mk
+++ b/vars.mk
@@ -28,6 +28,16 @@ else
     G_CXX := g++
 endif
 
+
+ifeq (${BUILD},WIN32)
+    G_LIBGL   := -lopengl32 -lglu32
+    G_LIBSDL  := `/usr/mingw32/bin/sdl-config --libs`
+else
+    G_LIBGL   := -lGL -lGLU
+    G_LIBSDL  := `sdl-config --libs`
+endif
+
+
 ifeq (${BUILD},WIN32)
     PRNTFMT := printf "%-12s: %s\n"
 else
@@ -48,3 +58,14 @@ else
     Q2 :=
 endif
 
+
+ifeq (${BUILD},WIN32)
+    prefix      := /usr/mingw32
+else
+    prefix      := /usr
+endif
+exec_prefix := ${prefix}
+includedir  := ${prefix}/include
+libdir      := ${exec_prefix}/lib
+INSTALL     := install
+