From: John L. <jr...@us...> - 2005-12-12 05:16:39
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/apps/wxluaedit/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/apps/wxluaedit/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 1 Dec 2005 04:17:29 -0000 1.2 --- Makefile 12 Dec 2005 05:16:31 -0000 1.3 *************** *** 13,17 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 13,17 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXEXECDIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 27,31 **** WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 28,32 ---- WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 49,53 **** WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! APPEXTRADEFS=-I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 50,54 ---- WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! APPEXTRADEFS = -I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs |