Update of /cvsroot/wxlua/wxLua/build
In directory vz-cvs-4.sog:/tmp/cvs-serv7535/build
Modified Files:
Makefile_wx-config.in
Log Message:
64 compilation fix
Add Makefile.wx-config to easily build all using only the wx-config script
add linker --rpath so you don't have to set LD_LIBRARY_PATH to find libs
Index: Makefile_wx-config.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile_wx-config.in 12 Aug 2010 23:41:09 -0000 1.8
--- Makefile_wx-config.in 3 Apr 2011 05:44:15 -0000 1.9
***************
*** 12,23 ****
#WXLUA_DIR = ../../..
# --- wxLua parameters -------------------------------------------------------
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)
! WXLUA_LIBDIR = $(WXLIB_DIR)
WXLUA_TARGET_LIBDIR = $(WXLUA_LIBDIR)
--- 12,27 ----
#WXLUA_DIR = ../../..
+ WXLUA_DIR_ABS := $(realpath $(WXLUA_DIR))
+
# --- wxLua parameters -------------------------------------------------------
WXLUA_LIBVERSION_CURRENT = 2
WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE = 12
! # We can use the wxWidgets lib dir to put our libs into (it must be writeable)
! #WXLUA_LIBDIR = $(WXLIB_DIR)
! # Put the libs into the wxLua/lib directory
! WXLUA_LIBDIR = $(WXLUA_DIR_ABS)/lib/
WXLUA_TARGET_LIBDIR = $(WXLUA_LIBDIR)
***************
*** 117,121 ****
CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC
! LDLIBS := $(WXLDLIBS)
CXX := $(WXCXX)
--- 121,125 ----
CXXFLAGS := $(WXCXXFLAGS) -MMD -g -Wall -fPIC
! LDLIBS := $(WXLDLIBS) -ldl -Wl,--rpath -Wl,$(WXLUA_DIR_ABS)/lib
CXX := $(WXCXX)
|
