Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxbind/src
Modified Files:
Makefile
Log Message:
Fix Makefiles to use wx-config --exec-prefix for lib dir
remove wxLiaCheckRunError, make CheckRunError static in wxLuaState
Capitalize all functions in genwxbind.lua, provide means to dump data types
wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found
comment wx.rules and give better names to variables
move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX
move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX
Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 20 Nov 2005 22:31:43 -0000 1.3
--- Makefile 12 Dec 2005 05:16:31 -0000 1.4
***************
*** 2,6 ****
# Author: J Winwood
# Created: 2002
! # Updated:
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
--- 2,6 ----
# Author: J Winwood
# Created: 2002
! # Updated:
# Copyright: (c) 2002 Lomtick Software. All rights reserved.
#
***************
*** 16,20 ****
WXLUA_DIR = ../../..
! WXLUA_LIBDIR = $(WXPREFIX)/lib
LUA = $(WXLUA_DIR)/bin/lua
--- 16,20 ----
WXLUA_DIR = ../../..
! WXLUA_LIBDIR = $(WXLIB_DIR)
LUA = $(WXLUA_DIR)/bin/lua
***************
*** 24,27 ****
--- 24,28 ----
WXCONFIG := wx-config
WXPREFIX = $(shell $(WXCONFIG) --prefix)
+ WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix)
WXBASENAME = $(shell $(WXCONFIG) --basename)
WXVERSION = $(shell $(WXCONFIG) --version)
***************
*** 29,34 ****
WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
WXLDLIBS = $(shell $(WXCONFIG) --libs)
! WXCXX = $(shell $(WXCONFIG) --cxx)
! WXLIB_DIR = $(WXPREFIX)/lib
# ----------------------------------------------------------------------------
--- 30,35 ----
WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
WXLDLIBS = $(shell $(WXCONFIG) --libs)
! WXCXX = $(shell $(WXCONFIG) --cxx)
! WXLIB_DIR = $(WXEXECDIR)/lib
# ----------------------------------------------------------------------------
***************
*** 37,44 ****
CXX = $(WXCXX)
! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE)
! WXBIND_TARGET_LIBDIR = $(WXPREFIX)/lib
WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a
--- 38,45 ----
CXX = $(WXCXX)
! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE)
! WXBIND_TARGET_LIBDIR = $(WXLUA_LIBDIR)
WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a
***************
*** 53,57 ****
LN_S = ln -s
! HEADERS =
SOURCES = \
--- 54,58 ----
LN_S = ln -s
! HEADERS =
SOURCES = \
***************
*** 98,106 ****
.cpp.o:
! $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<
all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED)
! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS)
@$(RM) $@
$(AR) $(AROPTIONS) $@ $(OBJECTS)
--- 99,107 ----
.cpp.o:
! $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED)
! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS)
@$(RM) $@
$(AR) $(AROPTIONS) $@ $(OBJECTS)
***************
*** 118,122 ****
$(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \
$(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \
! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2)
-include $(DEPFILES)
--- 119,123 ----
$(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \
$(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \
! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2)
-include $(DEPFILES)
|
