Update of /cvsroot/wxlua/wxLua/build
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19976/build
Modified Files:
Makefile_wx-config.in
Log Message:
Fix last commit to properly evaluate vars
Index: Makefile_wx-config.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile_wx-config.in 15 May 2008 04:10:09 -0000 1.6
--- Makefile_wx-config.in 21 May 2008 03:21:11 -0000 1.7
***************
*** 16,20 ****
WXLUA_LIBVERSION_CURRENT = 2
WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE = 0
# We use the wxWidgets lib dir to put our libs into (it must be writeable)
--- 16,20 ----
WXLUA_LIBVERSION_CURRENT = 2
WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE = 7
# We use the wxWidgets lib dir to put our libs into (it must be writeable)
***************
*** 63,67 ****
WXLIB_DIR := $(WXEXECDIR)/lib
! WXSTC_LIB := $(WXBASENAME)_stc-$(WXRELEASE)
# ----------------------------------------------------------------------------
--- 63,67 ----
WXLIB_DIR := $(WXEXECDIR)/lib
! WXSTC_LIB := $(WXBASENAME)_stc-$(WXRELEASE)
# ----------------------------------------------------------------------------
***************
*** 128,135 ****
# ----------------------------------------------------------------------------
! WXLUA_TARGET_LIB_STATIC := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED := $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1 := $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2 := $(WXLUA_TARGET_LIBNAME).so
# ----------------------------------------------------------------------------
--- 128,135 ----
# ----------------------------------------------------------------------------
! WXLUA_TARGET_LIB_STATIC = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).a
! WXLUA_TARGET_LIB_SHARED = $(WXLUA_TARGET_LIBDIR)/$(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXLUA_TARGET_LIB_LINK1 = $(WXLUA_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXLUA_TARGET_LIB_LINK2 = $(WXLUA_TARGET_LIBNAME).so
# ----------------------------------------------------------------------------
|
