Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.3,1.4 Makefile_import,1.2,1.3 editor.h,1.1,1.2 wxlua.cpp,1.4,1.5
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/apps/wxlua/src Modified Files: Makefile Makefile_import editor.h wxlua.cpp Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua.cpp 20 Jun 2005 06:55:22 -0000 1.4 --- wxlua.cpp 19 Nov 2005 07:08:39 -0000 1.5 *************** *** 376,382 **** } int wxLuaStandaloneApp::RunEditor() { - #include "editor.h" /* wxFileSystem::AddHandler(new wxMemoryFSHandler); --- 376,383 ---- } + #include "editor.h" + int wxLuaStandaloneApp::RunEditor() { /* wxFileSystem::AddHandler(new wxMemoryFSHandler); *************** *** 390,394 **** lua_setglobal(m_luaState, "standaloneLoadBitmaps"); */ ! return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName); } --- 391,395 ---- lua_setglobal(m_luaState, "standaloneLoadBitmaps"); */ ! return m_luaInterpreter->RunBuffer(wxLuaEditor, wxLuaEditor_len, g_strProgramName); } Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 17 Nov 2005 05:51:20 -0000 1.3 --- Makefile 19 Nov 2005 07:08:38 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- WXLUA = ../../.. + LUA = $(WXLUA)/bin/lua LUA_LIBS = ../../../lib/liblua.a ../../../lib/liblualib.a *************** *** 85,93 **** ../../../modules/wxbind/src/xml.o - .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua bindings wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 86,93 ---- ../../../modules/wxbind/src/xml.o .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) *************** *** 100,114 **** make -f Makefile_import wxLuaBindings: $(WXLUABINDINGS) $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) wxLuaLib: ! @(cd ../../../modules/wxlua/src && make) wxLuaDebugLib: ! @(cd ../../../modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd ../../../modules/wxluasocket/src && make) clean: --- 100,117 ---- 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: ! @(cd $(WXLUA)/modules/wxlua/src && make) wxLuaDebugLib: ! @(cd $(WXLUA)/modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd $(WXLUA)/modules/wxluasocket/src && make) clean: *************** *** 118,125 **** rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core make -f Makefile_import clean ! @(cd ../../../modules/wxlua/src && make clean) ! @(cd ../../../modules/wxluadebug/src && make clean) ! @(cd ../../../modules/wxluasocket/src && make clean) ! -include $(DEPFILES) --- 121,127 ---- rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core make -f Makefile_import clean ! @(cd $(WXLUA)/modules/wxlua/src && make clean) ! @(cd $(WXLUA)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA)/modules/wxluasocket/src && make clean) -include $(DEPFILES) Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editor.h 7 Jun 2005 04:17:29 -0000 1.1 --- editor.h 19 Nov 2005 07:08:38 -0000 1.2 *************** *** 1,2582 **** ! /* Editor.wx.luc */ ! static const unsigned char wxLuaEditor[]={ ! 27, 76,117, 97, 80, 1, 4, 4, 4, 6, 8, 9, 9, 8,182, 9,147,104,231,245, ! 125, 65, 8, 0, 0, 0, 61, 40,110,111,110,101, 41, 0, 0, 0, 0, 0, 0, 0, ! 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 1, 0, 0, 4, 3, ! 0, 0, 0,119,120, 0, 4, 13, 0, 0, 0,119,120, 73, 68, 95, 72, 73, 71, 72, ! 69, 83, 84, 0, 3, 0, 0, 0, 0, 0, 0,240, 63, 3, 0, 0, 0, 0, 0, 0, ! 0, 64, 3, 0, 0, 0, 0, 0, 0, 8, 64, 3, 0, 0, 0, 0, 0, 0, 16, 64, ! 3, 0, 0, 0, 0, 0, 0, 20, 64, 3, 0, 0, 0, 0, 0, 0, 24, 64, 3, 0, ! 0, 0, 0, 0, 0, 28, 64, 3, 0, 0, 0, 0, 0, 0, 32, 64, 3, 0, 0, 0, [...4647 lines suppressed...] ! 105,102, 32, 97,114,103,115, 32,116,104,101,110, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 76,111, 97,100,101,100, 10, ! 32, 32, 32, 32,112,114,111,103,114, 97,109, 78, 97,109,101, 32, 61, 32, 97,114,103,115, 91, 48, 93, 32, 32, 32, 32, 10, ! 32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 44, 32,102,105,108,101, 78, 97,109,101, 32,105,110, 32, 97,114,103,115, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,105,110,100,101,120, 32,126, 61, 32, 34,110, 34, 32, 97,110,100, 32,105,110,100,101,120, 32,126, 61, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 76,111, 97,100,101,100, 32, 61, 32, 49, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116, 32,102,105,108,101, 76,111, 97,100,101,100, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 101,110,100, 10, ! 10, ! 45, 45, 32,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 0 }; Index: Makefile_import =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile_import 17 Nov 2005 05:51:20 -0000 1.2 --- Makefile_import 19 Nov 2005 07:08:38 -0000 1.3 *************** *** 10,14 **** WXLUA = ../../.. ! LUA=$(WXLUA)/lua WXDIR = $(shell wx-config --prefix) --- 10,14 ---- WXLUA = ../../.. ! LUA=$(WXLUA)/bin/lua WXDIR = $(shell wx-config --prefix) *************** *** 19,35 **** THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! all: genwxbind ! DEPFILES = luasetup.h.in # $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) # This is depricated and does not currenly generate bindings that work with wxLua wxluawrap.cpp: $(DEPFILES) ! $(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua genwxbind: $(DEPFILES) ! @(cd ../../../bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) #clean: # rm -f wxluawrap.cpp - --- 19,35 ---- THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=luasetup.h.in $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) ! 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) |
