Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.4,1.5 Makefile_import,1.3,1.4 luasetup.h.in,1.1,NONE wrap.lua,1.1,NONE
|
From: John L. <jr...@us...> - 2005-11-20 06:36:47
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12516/wxLua/apps/wxlua/src Modified Files: Makefile Makefile_import Removed Files: luasetup.h.in wrap.lua Log Message: remove unused files move the binding makefile into the bindings/wxwidgets --- wrap.lua DELETED --- --- luasetup.h.in DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 19 Nov 2005 07:08:38 -0000 1.4 --- Makefile 20 Nov 2005 06:36:39 -0000 1.5 *************** *** 7,11 **** # Makefile for wxLua standalone sample using gmake ! LUADIR = ../../../modules/lua WXDIR = $(shell wx-config --prefix) WXLIBDIR = $(WXDIR)/lib --- 7,13 ---- # Makefile for wxLua standalone sample using gmake ! WXLUA = ../../.. ! ! LUADIR = $(WXLUA)/modules/lua WXDIR = $(shell wx-config --prefix) WXLIBDIR = $(WXDIR)/lib *************** *** 22,37 **** PROGRAM = wxLua - WXLUA = ../../.. LUA = $(WXLUA)/bin/lua ! LUA_LIBS = ../../../lib/liblua.a ../../../lib/liblualib.a WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE) WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE) WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE) WXFL_LIB = $(WXLIBBASE)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I../../../modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 24,39 ---- PROGRAM = wxLua LUA = $(WXLUA)/bin/lua ! LUA_LIBS = $(WXLUA)/lib/liblua.a $(WXLUA)/lib/liblualib.a WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE) + WXLUABIND_LIB = $(WXLIBBASE)_wxluabind-$(WXRELEASE) WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE) WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE) WXFL_LIB = $(WXLIBBASE)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I$(WXLUA)/modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs *************** *** 40,93 **** # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) ! ! OBJECTS=wxlua.o $(WXLUABINDINGS) ! #wxluawrap.o ../../../modules/wxbind/src/wxlhtmlwin.o ../../../modules/wxbind/src/wxlprint.o DEPFILES=$(OBJECTS:.o=.d) - WXLUABINDINGS = \ - ../../../modules/wxbind/src/appframe.o \ - ../../../modules/wxbind/src/clipdrag.o \ - ../../../modules/wxbind/src/config.o \ - ../../../modules/wxbind/src/controls.o \ - ../../../modules/wxbind/src/data.o \ - ../../../modules/wxbind/src/datetime.o \ - ../../../modules/wxbind/src/defsutil.o \ - ../../../modules/wxbind/src/dialogs.o\ - ../../../modules/wxbind/src/event.o \ - ../../../modules/wxbind/src/file.o \ - ../../../modules/wxbind/src/fl.o \ - ../../../modules/wxbind/src/gdi.o \ - ../../../modules/wxbind/src/geometry.o \ - ../../../modules/wxbind/src/grid.o \ - ../../../modules/wxbind/src/help.o \ - ../../../modules/wxbind/src/html.o \ - ../../../modules/wxbind/src/image.o \ - ../../../modules/wxbind/src/mdi.o \ - ../../../modules/wxbind/src/menutool.o \ - ../../../modules/wxbind/src/plot.o \ - ../../../modules/wxbind/src/print.o \ - ../../../modules/wxbind/src/regex.o \ - ../../../modules/wxbind/src/sizer.o \ - ../../../modules/wxbind/src/socket.o \ - ../../../modules/wxbind/src/stc.o \ - ../../../modules/wxbind/src/thread.o \ - ../../../modules/wxbind/src/wave.o \ - ../../../modules/wxbind/src/windows.o \ - ../../../modules/wxbind/src/wx_builtin.o \ - ../../../modules/wxbind/src/wx_class.o \ - ../../../modules/wxbind/src/wx_define.o \ - ../../../modules/wxbind/src/wx_event.o \ - ../../../modules/wxbind/src/wxlhtmlwin.o \ - ../../../modules/wxbind/src/wxlprint.o \ - ../../../modules/wxbind/src/wxlua.o \ - ../../../modules/wxbind/src/wx_object.o \ - ../../../modules/wxbind/src/xml.o - .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 42,54 ---- # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB) + OBJECTS=wxlua.o DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) *************** *** 98,108 **** bindings: ! make -f Makefile_import editor: $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h ! wxLuaBindings: $(WXLUABINDINGS) ! $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) wxLuaLib: --- 59,69 ---- bindings: ! @(cd $(WXLUA)/bindings/wxwidgets && make) editor: $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h ! wxLuaBindings: ! @(cd $(WXLUA)/modules/wxbind/src && make) wxLuaLib: *************** *** 124,127 **** --- 85,89 ---- @(cd $(WXLUA)/modules/wxluadebug/src && make clean) @(cd $(WXLUA)/modules/wxluasocket/src && make clean) + @(cd $(WXLUA)/modules/wxbind/src && make clean) -include $(DEPFILES) Index: Makefile_import =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile_import 19 Nov 2005 07:08:38 -0000 1.3 --- Makefile_import 20 Nov 2005 06:36:39 -0000 1.4 *************** *** 7,11 **** # # ! # Makefile for wxLua library, Unix WXLUA = ../../.. --- 7,11 ---- # # ! # Makefile for generating the bindings WXLUA = ../../.. *************** *** 23,35 **** all: genwxbind - # This is depricated and does not currenly generate bindings that work with wxLua - wxluawrap.cpp: $(DEPFILES) - $(LUA) -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua - genwxbind: $(DEPFILES) @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) ! #clean: ! # rm -f wxluawrap.cpp ! ! # -include $(DEPFILES) --- 23,28 ---- all: genwxbind genwxbind: $(DEPFILES) @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) ! clean: |
