Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/apps/wxlua/src Modified Files: lconsole.cpp lconsole.h wxlua.cpp wxlua.h Log Message: remove all #pragma interface since they are no longer needed Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wxlua.cpp 8 Dec 2006 06:16:17 -0000 1.42 --- wxlua.cpp 12 Dec 2006 01:23:40 -0000 1.43 *************** *** 10,17 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlua.h" - #endif - #include "wx/wxprec.h" --- 10,13 ---- Index: lconsole.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** lconsole.h 7 Dec 2006 22:05:52 -0000 1.9 --- lconsole.h 12 Dec 2006 01:23:40 -0000 1.10 *************** *** 10,17 **** #define WX_LUA_CONSOLE_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "lconsole.h" - #endif - #include "wx/frame.h" #include "wxlua/include/wxlua.h" --- 10,13 ---- *************** *** 28,41 **** { public: ! wxLuaConsole(wxWindow* parent, wxWindowID id, const wxString& title = wxT("wxLua console"), ! const wxPoint& pos = wxDefaultPosition, ! const wxSize& size = wxSize(300, 400), ! long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("wxLuaConsole")); ! // Display a message in the console void DisplayText(const wxString& msg); ! // Display the stack in a wxListBox, but only if there are any items in it void DisplayStack(const wxLuaState& wxlState); // An error has occurred, when this window is closed call wxExit to close --- 24,37 ---- { public: ! wxLuaConsole(wxWindow* parent, wxWindowID id, const wxString& title = wxT("wxLua console"), ! const wxPoint& pos = wxDefaultPosition, ! const wxSize& size = wxSize(300, 400), ! long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("wxLuaConsole")); ! // Display a message in the console void DisplayText(const wxString& msg); ! // Display the stack in a wxListBox, but only if there are any items in it void DisplayStack(const wxLuaState& wxlState); // An error has occurred, when this window is closed call wxExit to close Index: wxlua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxlua.h 7 Dec 2006 01:22:02 -0000 1.22 --- wxlua.h 12 Dec 2006 01:23:40 -0000 1.23 *************** *** 13,20 **** #define WX_LUAAPP_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlua.h" - #endif - #include "wx/app.h" #include "wxluasocket/include/wxldtarg.h" --- 13,16 ---- Index: lconsole.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lconsole.cpp 7 Dec 2006 22:05:52 -0000 1.14 --- lconsole.cpp 12 Dec 2006 01:23:40 -0000 1.15 *************** *** 9,16 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "lconsole.h" - #endif - #include "wx/wxprec.h" --- 9,12 ---- *************** *** 42,46 **** wxLuaConsole::wxLuaConsole(wxWindow* parent, wxWindowID id, const wxString& title, ! const wxPoint& pos, const wxSize& size, long style, const wxString& name) :wxFrame(parent, id, title, pos, size, style, name), m_exit_on_error(false) --- 38,42 ---- wxLuaConsole::wxLuaConsole(wxWindow* parent, wxWindowID id, const wxString& title, ! const wxPoint& pos, const wxSize& size, long style, const wxString& name) :wxFrame(parent, id, title, pos, size, style, name), m_exit_on_error(false) *************** *** 49,62 **** m_splitter = new wxSplitterWindow(this, wxID_ANY, ! wxDefaultPosition, wxDefaultSize, wxSP_3DSASH); m_textCtrl = new wxTextCtrl(m_splitter, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH); ! m_debugListBox = new wxListBox(m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, ! 0, NULL, wxLB_SINGLE); m_debugListBox->Show(false); ! // listbox is shown only when used m_splitter->Initialize(m_textCtrl); --- 45,58 ---- m_splitter = new wxSplitterWindow(this, wxID_ANY, ! wxDefaultPosition, wxDefaultSize, wxSP_3DSASH); m_textCtrl = new wxTextCtrl(m_splitter, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY | wxTE_RICH); ! m_debugListBox = new wxListBox(m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, ! 0, NULL, wxLB_SINGLE); m_debugListBox->Show(false); ! // listbox is shown only when used m_splitter->Initialize(m_textCtrl); *************** *** 100,104 **** { if (luaDebug.name != NULL) ! buffer.Printf(wxT("function %s"), lua2wx(luaDebug.name).c_str()); else --- 96,100 ---- { if (luaDebug.name != NULL) ! buffer.Printf(wxT("function %s"), lua2wx(luaDebug.name).c_str()); else |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxbind/src Modified Files: wxlhtmlwin.cpp wxlprint.cpp Log Message: remove all #pragma interface since they are no longer needed Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlprint.cpp 11 Apr 2006 21:08:22 -0000 1.10 --- wxlprint.cpp 12 Dec 2006 01:23:40 -0000 1.11 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlprint.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- *************** *** 56,60 **** *minPage = *maxPage = *pageFrom = *pageTo = 0; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "GetPageInfo")) { --- 52,56 ---- *minPage = *maxPage = *pageFrom = *pageTo = 0; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "GetPageInfo")) { *************** *** 86,90 **** bool fResult = false; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "HasPage")) { --- 82,86 ---- bool fResult = false; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "HasPage")) { *************** *** 111,115 **** bool fResult = true; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginDocument")) { --- 107,111 ---- bool fResult = true; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginDocument")) { *************** *** 136,140 **** { // NOTE: The wxLua program MUST call the base class, see printing.wx.lua ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndDocument")) { --- 132,136 ---- { // NOTE: The wxLua program MUST call the base class, see printing.wx.lua ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndDocument")) { *************** *** 152,156 **** void wxLuaPrintout::OnBeginPrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginPrinting")) { --- 148,152 ---- void wxLuaPrintout::OnBeginPrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnBeginPrinting")) { *************** *** 168,172 **** void wxLuaPrintout::OnEndPrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndPrinting")) { --- 164,168 ---- void wxLuaPrintout::OnEndPrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnEndPrinting")) { *************** *** 184,188 **** void wxLuaPrintout::OnPreparePrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPreparePrinting")) { --- 180,184 ---- void wxLuaPrintout::OnPreparePrinting() { ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPreparePrinting")) { *************** *** 202,206 **** bool fResult = false; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPrintPage")) { --- 198,202 ---- bool fResult = false; ! if (m_wxlState.Ok() && !m_wxlState.GetCallBaseClassFunction() && m_wxlState.HasDerivedMethod(this, "OnPrintPage")) { Index: wxlhtmlwin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlhtmlwin.cpp 28 Aug 2006 05:26:20 -0000 1.11 --- wxlhtmlwin.cpp 12 Dec 2006 01:23:40 -0000 1.12 *************** *** 8,15 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxlhtmlwin.h" - #endif - #include "wx/wxprec.h" --- 8,11 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/modules/wxbind/include Modified Files: wxlhtmlwin.h wxlprint.h Log Message: remove all #pragma interface since they are no longer needed Index: wxlhtmlwin.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlhtmlwin.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlhtmlwin.h 20 May 2006 14:00:47 -0000 1.5 --- wxlhtmlwin.h 12 Dec 2006 01:23:40 -0000 1.6 *************** *** 10,17 **** #define WX_LUA_HTML_WINDOW_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlhtmlwin.h" - #endif - #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" --- 10,13 ---- Index: wxlprint.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlprint.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlprint.h 20 May 2006 14:00:47 -0000 1.6 --- wxlprint.h 12 Dec 2006 01:23:40 -0000 1.7 *************** *** 10,17 **** #define WX_LUA_PRINTING_H - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxlprint.h" - #endif - #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" --- 10,13 ---- |
|
From: John L. <jr...@us...> - 2006-12-12 01:23:43
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16152/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp wxledit.h Log Message: remove all #pragma interface since they are no longer needed Index: wxledit.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxledit.h 5 Sep 2006 21:48:11 -0000 1.13 --- wxledit.h 12 Dec 2006 01:23:40 -0000 1.14 *************** *** 12,19 **** #define _WX_LUAEDITOR_H_ - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "wxledit.h" - #endif - #include "wxlua/include/wxlstate.h" --- 12,15 ---- Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxledit.cpp 3 Oct 2006 05:12:45 -0000 1.25 --- wxledit.cpp 12 Dec 2006 01:23:40 -0000 1.26 *************** *** 10,17 **** ///////////////////////////////////////////////////////////////////////////// - #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "wxledit.h" - #endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" --- 10,13 ---- |
|
From: John L. <jr...@us...> - 2006-12-11 23:25:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4363/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h Log Message: cleanup all the comments, code, func/var names in the wxLuaState Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlbind.h 11 Dec 2006 04:38:27 -0000 1.27 --- wxlbind.h 11 Dec 2006 23:25:05 -0000 1.28 *************** *** 129,141 **** ~wxLuaFunction() {} ! int CallMethod(lua_State *L) ! { ! // remove this line to restore calling methods using the dot notation ! // otherwise the colon notation *must* be used. ! lua_remove(L, 1); ! ! return (*m_pMethod->func)(L); ! } ! void *GetObject() const { return m_pObject; } --- 129,133 ---- ~wxLuaFunction() {} ! int CallMethod(lua_State *L); void *GetObject() const { return m_pObject; } *************** *** 146,149 **** --- 138,147 ---- }; + // Garbage collect and free memory associated with the wxLuaFunction class + // lua's __gc metatable function. + int LUACALL wxLua_lua_gc_wxLuaFunction(lua_State *L); + // call a wxLuaFunction, lua's __call metatable function. + int LUACALL wxLua_lua_call_wxLuaFunction(lua_State *L); + // ---------------------------------------------------------------------------- // wxLuaObject - wraps a reference to a Lua object reference inside a Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** wxlstate.h 7 Dec 2006 01:22:02 -0000 1.53 --- wxlstate.h 11 Dec 2006 23:25:05 -0000 1.54 *************** *** 98,110 **** //---------------------------------------------------------------------------- ! // C functions for lua used in the wxLuaState //---------------------------------------------------------------------------- - // Garbage collect and free memory associated with the lua call class, lua's __gc - int LUACALL wxLua_lua_gcFunction(lua_State *L); - - // call a Lua function, lua's __call - int LUACALL wxLua_lua_callFunction(lua_State *L); - // ---------------------------------------------------------------------------- // lua C helper functions - These functions are also part of the wxLuaState --- 98,104 ---- //---------------------------------------------------------------------------- ! // C functions for lua used by the wxLuaState //---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // lua C helper functions - These functions are also part of the wxLuaState *************** *** 115,159 **** // ---------------------------------------------------------------------------- ! // create a reference to the object at index iParam in the Lua index ! //WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tinsert(lua_State* L, int iParam) ); ! // push onto the top of the stack the object referenced by iReference ! //WXDLLIMPEXP_WXLUA wxDEPRECATED( bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference) ); ! // Get the number of items in the reference table ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int iReference); ! // remove a Lua reference ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tgetn(lua_State* L); ! // Display an error message WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg); ! // push onto the top of the stack an userdata object containing u using tag to set the metatable WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag); ! // get the tag of the object at index ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_ttag(lua_State* L, int index); ! // return the user data in the userdata object at index, if reset is true clear the user data ! WXDLLIMPEXP_WXLUA void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int index, bool reset = false); ! // allocate a new metatable return its reference ! //WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tnewtag(lua_State* L) ); ! //WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool fWeakKey, bool fWeakData) ); ! // set the metatable of the object at top of stack from the reference tag WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tsettag(lua_State* L, int tag); ! // set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL); ! // push the wxLuaReferences string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaReferences(lua_State* L); ! // push the wxLuaNull string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaNull(lua_State* L); // Helper functions to get numbers, booleans and strings safer // Validate that the object at the stack index specified is a string, bool, ! // enum, or double number object or that the object can be converted it. ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isstringtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isbooleantype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isenumerationtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isnumbertype(lua_State* L, int iParam); // After verifying using wxLua_lua_isXXXtype return the value ! WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA double LUACALL wxLua_lua_getnumbertype(lua_State* L, int iParam); // Helper functions to get/set tables of strings and ints --- 109,163 ---- // ---------------------------------------------------------------------------- ! // Create a reference to the object at stack index in the ! // wxLuaReferences registry table, returns the table index. ! //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tinsert(lua_State* L, int stack_idx); ! // Remove a reference to the object at the index in the ! // wxLuaReferences registry table, returns success. ! //WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference); ! // Push onto the top of the stack the object at the index in the ! // wxLuaReferences registry table, returns success. ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int wxlref_index); ! // Get the number of items in the wxLuaReferences registry table ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tgetn(lua_State* L); ! // Push the errorMsg on the stack and call lua_error WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg); ! // Push the object u onto the top of the stack as a userdata of type tag ! // and set the metatable to the object at tget(tag) WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag); ! // Get the tag of the object at the stack index, returns TLUA_NOTAG if no tag ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_ttag(lua_State* L, int stack_idx); ! // Get the userdata at the stack index, if null_ptr then set the userdata pointer ! // in lua to NULL so that lua won't gc it. ! WXDLLIMPEXP_WXLUA void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int stack_idx, bool null_ptr = false); ! // Allocate a new table (metatable) tinsert it into the wxLuaReferences registry table ! // and return its index into the ref table. ! //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewtag(lua_State* L); ! // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences ! // registry table and return its index into the ref table. ! //WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool weak_keys, bool weak_values); ! // Set the metatable of the object at top of stack to tget(tag) WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tsettag(lua_State* L, int tag); ! // Set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL); ! ! // Push the "wxLuaReferences" string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_push_wxLuaReferences(lua_State* L); ! // push the "wxLuaNull" string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_push_wxLuaNull(lua_State* L); // Helper functions to get numbers, booleans and strings safer // Validate that the object at the stack index specified is a string, bool, ! // enum, or double number object or that the object can be converted to it. ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isstringtype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isbooleantype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isenumerationtype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_isnumbertype(lua_State* L, int stack_idx); // After verifying using wxLua_lua_isXXXtype return the value ! WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int stack_idx); ! WXDLLIMPEXP_WXLUA double LUACALL wxLua_lua_getnumbertype(lua_State* L, int stack_idx); // Helper functions to get/set tables of strings and ints *************** *** 162,183 **** // object or can be converted to a string or number. ! // Convert the table at index iParam to a "new" array of wxStrings. // Return a pointer to the array of wxStrings (you need to delete them) // and returns the number of strings in the array in count. ! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int iParam, int& count); ! // Adds the table at index iParam to the wxArrayString // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarraystring(lua_State* L, int iParam, wxArrayString& strArray); ! // Convert the table at index iParam to a "new" array of const char* strings. // Return a pointer to the array of strings (you need to delete them) // returns the number of character strings in the array in count. ! WXDLLIMPEXP_WXLUA const char** LUACALL wxLua_lua_getchararray(lua_State* L, int iParam, int& count); ! // Convert the table at index iParam to a "new" array of int* numbers. // Return a pointer to the array of ints (you need to delete them) // returns the number of ints in the array in count. ! WXDLLIMPEXP_WXLUA int* LUACALL wxLua_lua_getintarray(lua_State* L, int iParam, int& count); ! // Adds the table at index iParam to the wxArrayInt // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarrayint(lua_State* L, int iParam, wxArrayInt& intArray); // Creates a lua table and pushes the strings into it, returns the number of items added --- 166,187 ---- // object or can be converted to a string or number. ! // Convert the table at stack index to a "new" array of wxStrings. // Return a pointer to the array of wxStrings (you need to delete them) // and returns the number of strings in the array in count. ! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int stack_idx, int& count); ! // Adds the table at stack index to the wxArrayString // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarraystring(lua_State* L, int stack_idx, wxArrayString& strArray); ! // Convert the table at stack index to a "new" array of const char* strings. // Return a pointer to the array of strings (you need to delete them) // returns the number of character strings in the array in count. ! WXDLLIMPEXP_WXLUA const char** LUACALL wxLua_lua_getchararray(lua_State* L, int stack_idx, int& count); ! // Convert the table at stack index to a "new" array of int* numbers. // Return a pointer to the array of ints (you need to delete them) // returns the number of ints in the array in count. ! WXDLLIMPEXP_WXLUA int* LUACALL wxLua_lua_getintarray(lua_State* L, int stack_idx, int& count); ! // Adds the table at stack index to the wxArrayInt // Return the number of strings added to the array in count. ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarrayint(lua_State* L, int stack_idx, wxArrayInt& intArray); // Creates a lua table and pushes the strings into it, returns the number of items added *************** *** 203,211 **** bool m_typesRegistered; // Are the bindings registered into the lua_State ! int m_functionTag; // The lua tag for function objects. ! int m_wxLuaNull; // The lua tag for wxLuaNull (for NULL pointers) ! int m_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table ! int m_wxEventTag; // The lua tag for wxEvents ! int m_wxWindowTag; // The lua tag for wxWindows bool m_callbase_func; // call the base class function instead of derived func --- 207,215 ---- bool m_typesRegistered; // Are the bindings registered into the lua_State ! int m_wxluatag_wxLuaFunction; // The lua tag for wxLuaFunctions. ! int m_wxluatag_wxLuaNull; // The lua tag for wxLuaNull (for NULL pointers) ! int m_wxluatag_wxWinDestroyTable; // The lua tag for the wxWindow destroy tracking table ! int m_wxluatag_wxEventTag; // The lua tag for wxEvents ! int m_wxluatag_wxWindowTag; // The lua tag for wxWindows bool m_callbase_func; // call the base class function instead of derived func *************** *** 220,224 **** // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle ! wxArrayInt m_usedIndexes; // array of the lua tags in the registry bool m_is_running; // is the lua_State running a script --- 224,229 ---- // but for an embedded program they must be deleted before // shutting down the interpreter, else they dangle ! wxArrayInt m_unusedReferenceIndexes; // array of unused (available) table indicies in the ! // wxLuaReferences registry table bool m_is_running; // is the lua_State running a script *************** *** 481,490 **** // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; ! bool GetTypesRegistered() const; // Is the binding registered ! int GetLuaFunctionTag() const; // The lua tag for function objects. ! int GetLuaNull() const; // The lua tag for wxLuaNull (for NULL pointers) int GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table ! int GetwxEventTag() const; // The lua tag for wxEvents ! int GetwxWindowTag() const; // The lua tag for wxWindows // When looking up a function to call, should the base class function --- 486,495 ---- // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; ! bool GetTypesRegistered() const; // Is the binding registered ! int GetwxLuaFunctionTag() const; // The lua tag for wxLuaFunction objects. ! int GetLuaNull() const; // The lua tag for wxLuaNull (for NULL pointers) int GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table ! int GetwxEventTag() const; // The lua tag for wxEvents ! int GetwxWindowTag() const; // The lua tag for wxWindows // When looking up a function to call, should the base class function *************** *** 521,547 **** // wxLua lua Registry Table Functions ! // create a reference to the object at index iParam in the Lua stack ! int tinsert(int iParam); ! // push onto the top of the stack the object referenced by iReference ! bool tget(int iReference); ! // remove a Lua reference ! bool tremove(int iReference); ! // Get the number of items in the reference table int tgetn(); ! // Display an error message void terror(const char *errorMsg) const; wxLUA_UNUSED_NOTUNICODE(void terror(const wxString& errorMsg) const { terror(wx2lua(errorMsg)); }) ! // push onto the top of the stack an userdata object containing u using tag to set the metatable void tpushusertag(const void *u, int tag); ! // get the tag of the object at index ! int ttag(int index) const; ! // return the user data in the userdata object at index, if reset is true clear the user data ! void* ttouserdata(int index, bool reset = false) const; ! // allocate a new metatable return its reference int tnewtag(); ! int tnewweaktag(bool fWeakKey, bool fWeakData); ! // set the metatable of the object at top of stack from the reference tag void tsettag(int tag); ! // set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class bool tsettagmethod(int tag, const char *method, lua_CFunction func, void *pClass = NULL); --- 526,561 ---- // wxLua lua Registry Table Functions ! // Create a reference to the object at stack index in the ! // wxLuaReferences registry table, returns the table index. ! int tinsert(int stack_idx); ! // Remove a reference to the object at the index in the ! // wxLuaReferences registry table, returns success. ! bool tremove(int wxlref_index); ! // Push onto the top of the stack the object at the index in the ! // wxLuaReferences registry table, returns success. ! bool tget(int wxlref_index); ! // Get the number of items in the wxLuaReferences registry table int tgetn(); ! // Push the errorMsg on the stack and call lua_error void terror(const char *errorMsg) const; wxLUA_UNUSED_NOTUNICODE(void terror(const wxString& errorMsg) const { terror(wx2lua(errorMsg)); }) ! // Push the object u onto the top of the stack as a userdata of type tag ! // and set the metatable to the object at tget(tag) void tpushusertag(const void *u, int tag); ! // Get the tag of the object at the stack index, returns TLUA_NOTAG if no tag ! int ttag(int stack_idx) const; ! // Get the userdata at the stack index, if null_ptr then set the userdata pointer ! // in lua to NULL so that lua won't gc it. ! void* ttouserdata(int stack_idx, bool null_ptr = false) const; ! // Create a new table (metatable) tinsert it into the wxLuaReferences registry table ! // and return its index into the ref table. int tnewtag(); ! // Create a new table and its metatable with weak keys and/or values by setting the ! // metatable's __weak index to [k/v]. The table is tinsert into the wxLuaReferences ! // registry table and return its index into the ref table. ! int tnewweaktag(bool weak_keys, bool weak_values); ! // Set the metatable of the object at top of stack to tget(tag) void tsettag(int tag); ! // Set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class bool tsettagmethod(int tag, const char *method, lua_CFunction func, void *pClass = NULL); *************** *** 550,563 **** // wxLua get data type ! // Check if the item at the lua stack index, iParam, is user data type iTag ! bool IsUserDataType(int iParam, int iTag) const; // Return a pointer to the object that corresponds to the specified stack // index and tag. Get a user data type (either allocated by us if the tag // is iTagS otherwise system allocated iTagP. ! // Iff the data type does not have the correct tag, or if the parameter ! // iParam is nil, NULL is returned, otherwise terror is called. ! void* GetUserDataType(int iParam, int iTag) const; // Push a data type onto the stack and set its tag ! void PushUserDataType(int iTag, const void *data); // helper functions to get numbers, booleans and strings safer --- 564,577 ---- // wxLua get data type ! // Check if the item at the lua stack index is user data type tag ! bool IsUserDataType(int stack_idx, int tag) const; // Return a pointer to the object that corresponds to the specified stack // index and tag. Get a user data type (either allocated by us if the tag // is iTagS otherwise system allocated iTagP. ! // If the data type does not have the correct tag, or if the parameter ! // stack_idx is nil, NULL is returned, otherwise terror is called. ! void* GetUserDataType(int stack_idx, int iTag) const; // Push a data type onto the stack and set its tag ! void PushUserDataType(int tag, const void *data); // helper functions to get numbers, booleans and strings safer *************** *** 566,586 **** // or that the object can be converted to a string and return the string, // calls terror if the value is not of the right type. ! const char* GetStringType(int iParam); // Validate that the object at the stack index specified is a boolean object // or that the object can be converted to a boolean and return the boolean. ! bool GetBooleanType(int iParam); // Validate that the object at the stack index specified is a enumeration object // or that the object can be converted to a enumeration and return the enumeration value. ! long GetEnumerationType(int iParam); // Validate that the object at the stack index specified is a number object // or that the object can be converted to a number and return the number value. ! double GetNumberType(int iParam); ! // Checks for if the item at iParam on the stack is one of the types or can // be converted into the type by lua, returns false if not (no errors) ! bool IsStringType(int iParam) const; ! bool IsBooleanType(int iParam) const; ! bool IsEnumerationType(int iParam) const; ! bool IsNumberType(int iParam) const; // Validate that the object at the stack index specified is a table object --- 580,600 ---- // or that the object can be converted to a string and return the string, // calls terror if the value is not of the right type. ! const char* GetStringType(int stack_idx); // Validate that the object at the stack index specified is a boolean object // or that the object can be converted to a boolean and return the boolean. ! bool GetBooleanType(int stack_idx); // Validate that the object at the stack index specified is a enumeration object // or that the object can be converted to a enumeration and return the enumeration value. ! long GetEnumerationType(int stack_idx); // Validate that the object at the stack index specified is a number object // or that the object can be converted to a number and return the number value. ! double GetNumberType(int stack_idx); ! // Checks for if the item at the stack index is one of the types or can // be converted into the type by lua, returns false if not (no errors) ! bool IsStringType(int stack_idx) const; ! bool IsBooleanType(int stack_idx) const; ! bool IsEnumerationType(int stack_idx) const; ! bool IsNumberType(int stack_idx) const; // Validate that the object at the stack index specified is a table object *************** *** 589,600 **** // Return a pointer to the array of wxStrings and set the size in count. // the return value wiil need to be deleted. ! wxString* GetStringArray(int iParam, int &count); // convert a parameter which is presumably a table into a wxArrayString. // returns the number of values in the array. ! int GetwxArrayString(int iParam, wxArrayString &strArray); // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. // the return value may need to be deleted. ! const char** GetCharArray(int iParam, int &count); // Validate that the object at the stack index specified is a table object --- 603,614 ---- // Return a pointer to the array of wxStrings and set the size in count. // the return value wiil need to be deleted. ! wxString* GetStringArray(int stack_idx, int &count); // convert a parameter which is presumably a table into a wxArrayString. // returns the number of values in the array. ! int GetwxArrayString(int stack_idx, wxArrayString &strArray); // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. // the return value may need to be deleted. ! const char** GetCharArray(int stack_idx, int &count); // Validate that the object at the stack index specified is a table object *************** *** 603,610 **** // Return a pointer to the array of ints and set the size in count // the return value will need to be deleted. ! int* GetIntArray(int iParam, int &count); // convert a parameter which is presumably a table into a wxArrayInt. // returns the number of values in the array. ! int GetwxArrayInt(int iParam, wxArrayInt &intArray); // Convert a wxArrayString object to a table of strings, returns number of values --- 617,624 ---- // Return a pointer to the array of ints and set the size in count // the return value will need to be deleted. ! int* GetIntArray(int stack_idx, int &count); // convert a parameter which is presumably a table into a wxArrayInt. // returns the number of values in the array. ! int GetwxArrayInt(int stack_idx, wxArrayInt &intArray); // Convert a wxArrayString object to a table of strings, returns number of values *************** *** 613,618 **** int PushwxArrayIntTable(const wxArrayInt &intArray); ! // Lookup and return the 'name' of a Lua object from its tag. ! const char* GetLuaTagName(int nTag) const; // Lookup a lua method or get property called cpIndex in the WXLUACLASS array pClass --- 627,633 ---- int PushwxArrayIntTable(const wxArrayInt &intArray); ! // Returns the 'name' of a lua userdata object from its tag. ! // returns wxEmptyString on failure. ! wxString GetLuaTagName(int tag) const; // Lookup a lua method or get property called cpIndex in the WXLUACLASS array pClass |
|
From: John L. <jr...@us...> - 2006-12-11 23:25:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4363/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: cleanup all the comments, code, func/var names in the wxLuaState Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** wxlstate.cpp 8 Dec 2006 06:16:17 -0000 1.81 --- wxlstate.cpp 11 Dec 2006 23:25:05 -0000 1.82 *************** *** 56,61 **** const char wxLuaNull[] = "wxNull"; - //extern int s_wxluatag_wxWindow; - wxLuaState wxNullLuaState(false); --- 56,59 ---- *************** *** 86,91 **** int LUACALL wxLua_lua_printFunction( lua_State *L ) [...1505 lines suppressed...] } --- 3416,3420 ---- int tag = ttag(arg+1+lua_argStart); ! fnCall += GetLuaTagName(tag); } } *************** *** 3500,3504 **** else { ! fnOverload += lua2wx(GetLuaTagName(tag)); } } --- 3475,3479 ---- else { ! fnOverload += GetLuaTagName(tag); } } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** wxlbind.cpp 1 Dec 2006 18:53:48 -0000 1.43 --- wxlbind.cpp 11 Dec 2006 23:25:05 -0000 1.44 *************** *** 46,49 **** --- 46,94 ---- //----------------------------------------------------------------------------- + // wxLuaFunction + //----------------------------------------------------------------------------- + + int wxLuaFunction::CallMethod(lua_State *L) + { + // remove this line to restore calling methods using the dot notation + // otherwise the colon notation *must* be used. + lua_remove(L, 1); + + return (*m_pMethod->func)(L); + } + + // A function object needs to be deleted because the object is being + // garbage collected. + int LUACALL wxLua_lua_gc_wxLuaFunction(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && + (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) + { + wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1, true); + if (pFunction != NULL) + delete pFunction; + } + return 0; + } + + // Handler for the 'function' tag method. + int LUACALL wxLua_lua_call_wxLuaFunction(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && + (wxlState.ttag(1) == wxlState.GetwxLuaFunctionTag())) + { + wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1); + return pFunction->CallMethod(L); + } + return 0; + } + + //----------------------------------------------------------------------------- // wxLuaObject //----------------------------------------------------------------------------- *************** *** 335,339 **** if (pFunction != NULL) { ! wxlState.tpushusertag(pFunction, wxlState.GetLuaFunctionTag()); result = 1; fFound = true; --- 380,384 ---- if (pFunction != NULL) { ! wxlState.tpushusertag(pFunction, wxlState.GetwxLuaFunctionTag()); result = 1; fFound = true; |
|
From: John L. <jr...@us...> - 2006-12-11 23:25:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4363/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: cleanup all the comments, code, func/var names in the wxLuaState Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxldebug.cpp 2 Nov 2006 23:38:09 -0000 1.23 --- wxldebug.cpp 11 Dec 2006 23:25:05 -0000 1.24 *************** *** 413,417 **** wxString pTagName; if (nTag != TLUA_NOTAG) ! pTagName = lua2wx(wxlState.GetLuaTagName(nTag)); if (!pTagName.IsEmpty()) --- 413,417 ---- wxString pTagName; if (nTag != TLUA_NOTAG) ! pTagName = wxlState.GetLuaTagName(nTag); if (!pTagName.IsEmpty()) |
|
From: John L. <jr...@us...> - 2006-12-11 23:25:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4363/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: cleanup all the comments, code, func/var names in the wxLuaState Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wx_rules.lua 31 Oct 2006 21:51:15 -0000 1.24 --- wx_rules.lua 11 Dec 2006 23:25:03 -0000 1.25 *************** *** 276,284 **** if (registerTypes) { ! wxLS.GetLuaStateData()->m_wxLuaNull = wxLS.tnewtag(); } ! wxLua_lua_tpushwxLuaNull(wxLS.GetLuaState()); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxLuaNull); lua_rawset(wxLS.GetLuaState(), luaTable); ]] --- 276,284 ---- if (registerTypes) { ! wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull = wxLS.tnewtag(); } ! wxLua_lua_push_wxLuaNull(wxLS.GetLuaState()); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull); lua_rawset(wxLS.GetLuaState(), luaTable); ]] |
|
From: John L. <jr...@us...> - 2006-12-11 23:25:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4363/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: cleanup all the comments, code, func/var names in the wxLuaState Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** wx_bind.cpp 7 Dec 2006 06:32:44 -0000 1.65 --- wx_bind.cpp 11 Dec 2006 23:25:04 -0000 1.66 *************** *** 6301,6309 **** if (registerTypes) { ! wxLS.GetLuaStateData()->m_wxLuaNull = wxLS.tnewtag(); } ! wxLua_lua_tpushwxLuaNull(wxLS.GetLuaState()); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxLuaNull); lua_rawset(wxLS.GetLuaState(), luaTable); } --- 6301,6309 ---- if (registerTypes) { ! wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull = wxLS.tnewtag(); } ! wxLua_lua_push_wxLuaNull(wxLS.GetLuaState()); ! wxLS.tpushusertag(NULL, wxLS.GetLuaStateData()->m_wxluatag_wxLuaNull); lua_rawset(wxLS.GetLuaState(), luaTable); } |
|
From: John L. <jr...@us...> - 2006-12-11 15:29:46
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11439/build/msw Modified Files: wxLua.dsw Log Message: wxbindstc depends on wxbind Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxLua.dsw 11 Dec 2006 15:21:35 -0000 1.15 --- wxLua.dsw 11 Dec 2006 15:29:43 -0000 1.16 *************** *** 195,198 **** --- 195,201 ---- Project_Dep_Name mod_wxlua End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbind + End Project Dependency }}} |
|
From: John L. <jr...@us...> - 2006-12-11 15:21:43
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7882/build/msw Modified Files: wxLua.dsw Log Message: reorder dependencies to build wxLua before bindings to make developers live easier Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxLua.dsw 10 Dec 2006 00:47:22 -0000 1.14 --- wxLua.dsw 11 Dec 2006 15:21:35 -0000 1.15 *************** *** 31,47 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency }}} --- 31,47 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency }}} *************** *** 61,67 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxbind - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxlua End Project Dependency --- 61,64 ---- *************** *** 72,75 **** --- 69,75 ---- Project_Dep_Name mod_wxluasocket End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbind + End Project Dependency }}} *************** *** 88,104 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency }}} --- 88,104 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency }}} *************** *** 118,134 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency }}} --- 118,134 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency }}} *************** *** 172,179 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 172,179 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency }}} *************** *** 190,197 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 190,197 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency }}} *************** *** 208,215 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 208,215 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency }}} *************** *** 226,230 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency --- 226,230 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency *************** *** 232,236 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 232,236 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency }}} *************** *** 247,266 **** {{{ Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency }}} --- 247,266 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_verbatimlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluasocket End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbindstc End Project Dependency }}} |
|
From: John L. <jr...@us...> - 2006-12-11 07:03:33
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/samples Modified Files: editor.wx.lua Log Message: try to fix crashing in MSW while trying to kill debuggee process Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** editor.wx.lua 10 Dec 2006 23:28:12 -0000 1.38 --- editor.wx.lua 11 Dec 2006 07:03:30 -0000 1.39 *************** *** 1656,1663 **** -- FIXME why would you want to run all the notebook pages? --for id, document in pairs(openDocuments) do ! -- local editor = document.editor ! local editor = GetEditor() ! local editorText = editor:GetText() local document = openDocuments[editor:GetId()] local filePath = MakeDebugFileName(editor, document.filePath) ok = debuggerServer:Run(filePath, editorText) --- 1656,1663 ---- -- FIXME why would you want to run all the notebook pages? --for id, document in pairs(openDocuments) do ! local editor = GetEditor() -- MUST use document.editor userdata! local document = openDocuments[editor:GetId()] + local editor = document.editor + local editorText = editor:GetText() local filePath = MakeDebugFileName(editor, document.filePath) ok = debuggerServer:Run(filePath, editorText) *************** *** 1703,1707 **** local line = event:GetLineNumber() local eventFileName = event:GetFileName() ! if string.sub(eventFileName, 1, 1) == '@' then eventFileName = string.sub(eventFileName, 2, -1) if wx.wxIsAbsolutePath(eventFileName) == false then --- 1703,1708 ---- local line = event:GetLineNumber() local eventFileName = event:GetFileName() ! ! if string.sub(eventFileName, 1, 1) == '@' then -- FIXME what is this? eventFileName = string.sub(eventFileName, 2, -1) if wx.wxIsAbsolutePath(eventFileName) == false then *************** *** 2042,2046 **** debugger_connected = false if debuggerServer then ! debuggerServer:Reset() debuggerServer:Delete() debuggerServer = nil --- 2043,2048 ---- debugger_connected = false if debuggerServer then ! --debuggerServer:Reset() ! debuggerServer:KillDebuggee() debuggerServer:Delete() debuggerServer = nil |
|
From: John L. <jr...@us...> - 2006-12-11 07:03:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h Log Message: try to fix crashing in MSW while trying to kill debuggee process Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxldserv.h 8 Dec 2006 06:16:17 -0000 1.26 --- wxldserv.h 11 Dec 2006 07:03:30 -0000 1.27 *************** *** 218,221 **** --- 218,226 ---- int GetPortNumber() const { return m_port_number; } + // Get the wxLuaDebuggerProcess used to run the debuggee in + wxLuaDebuggerProcess* GetDebuggeeProcess() { return m_debuggeeProcess; } + long GetDebuggeeProcessId() const { return m_debuggeeProcessID; } + bool KillDebuggee(); + // Set the program name to start the debuggee target with // Note: If the the program name is empty when this class is created, it |
|
From: John L. <jr...@us...> - 2006-12-11 07:03:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxluasocket.cpp Log Message: try to fix crashing in MSW while trying to kill debuggee process Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxldserv.cpp 8 Dec 2006 06:16:17 -0000 1.32 --- wxldserv.cpp 11 Dec 2006 07:03:30 -0000 1.33 *************** *** 198,208 **** wxLuaDebuggerBase::~wxLuaDebuggerBase() { ! if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0)) { // NULL the process before deleting so it won't try to delete it again wxLuaDebuggerProcess *p = m_debuggeeProcess; m_debuggeeProcess = NULL; ! if (p->Exists(m_debuggeeProcessID)) ! p->Kill(m_debuggeeProcessID, wxSIGKILL); } } --- 198,207 ---- wxLuaDebuggerBase::~wxLuaDebuggerBase() { ! if ((m_debuggeeProcess != NULL)) // && (m_debuggeeProcessID > 0)) { // NULL the process before deleting so it won't try to delete it again wxLuaDebuggerProcess *p = m_debuggeeProcess; m_debuggeeProcess = NULL; ! delete p; } } *************** *** 586,596 **** void wxLuaDebuggerBase::OnEndDebugeeProcess(wxProcessEvent& event) { ! m_debuggeeProcess = NULL; ! m_debuggeeProcessID = -1; ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_EXIT, this); ! debugEvent.SetMessage(wxString::Format(wxT("Process (%d) ended with exit code : %d"), event.GetPid(), event.GetExitCode())); ! ProcessEvent(debugEvent); ! event.Skip(); } --- 585,616 ---- void wxLuaDebuggerBase::OnEndDebugeeProcess(wxProcessEvent& event) { ! // The process's OnTerminate will null m_debuggeeProcess, ! // but if in destructor it's already NULL and don't send event. ! if (m_debuggeeProcess != NULL) ! { ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_EXIT, this); ! debugEvent.SetMessage(wxString::Format(wxT("Process (%d) ended with exit code : %d"), event.GetPid(), event.GetExitCode())); ! ProcessEvent(debugEvent); ! event.Skip(); ! } ! } ! bool wxLuaDebuggerBase::KillDebuggee() ! { ! if ((m_debuggeeProcess != NULL) && (m_debuggeeProcessID > 0)) ! { ! if (m_debuggeeProcess->Exists(m_debuggeeProcessID)) ! m_debuggeeProcess->Kill(m_debuggeeProcessID, wxSIGKILL); ! } ! ! if (m_debuggeeProcess != NULL) ! { ! wxLuaDebuggerProcess* p = m_debuggeeProcess; ! m_debuggeeProcess = NULL; ! delete p; ! m_debuggeeProcessID = -1; ! } ! ! return true; } *************** *** 673,676 **** --- 693,700 ---- m_debuggeeProcessID = wxExecute(command, wxEXEC_ASYNC, m_debuggeeProcess); + + if (m_debuggeeProcessID < 1) + KillDebuggee(); + return (m_debuggeeProcessID > 0); } Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxluasocket.cpp 4 Oct 2006 22:07:23 -0000 1.7 --- wxluasocket.cpp 11 Dec 2006 07:03:30 -0000 1.8 *************** *** 270,277 **** } ! // void DisplayStackDialog(wxWindow *pParent) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 270,281 ---- } ! // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // wxWindowID id = wxID_ANY + wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 279,287 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call DisplayStackDialog ! self->DisplayStackDialog(pParent); return 0; } static int LUACALL wxLua_wxLuaDebuggerServer_destructor(lua_State *L) { --- 283,347 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call DisplayStackDialog ! self->DisplayStackDialog(pParent, id); return 0; } + // long GetDebuggeeProcessId() const + static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); + // call GetDebuggeeProcessId + returns = self->GetDebuggeeProcessId(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // bool KillDebuggee() + static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); + // call KillDebuggee + returns = self->KillDebuggee(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // static wxString GetProgramName() + static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // call GetProgramName + returns = wxLuaDebuggerServer::GetProgramName(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // static wxString GetNetworkName() + static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // call GetNetworkName + returns = wxLuaDebuggerServer::GetNetworkName(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + static int LUACALL wxLua_wxLuaDebuggerServer_destructor(lua_State *L) { *************** *** 330,334 **** { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, { 0 } }, { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 1, { &s_wxluatag_wxWindow, 0 } }, { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, {0} }, --- 390,398 ---- { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, { 0 } }, { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, { 0 } }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, { 0 } }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, { 0 } }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, { 0 } }, { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, {0} }, |
|
From: John L. <jr...@us...> - 2006-12-11 07:03:33
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: try to fix crashing in MSW while trying to kill debuggee process Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** editor.h 10 Dec 2006 23:28:12 -0000 1.30 --- editor.h 11 Dec 2006 07:03:29 -0000 1.31 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 80023; ! const unsigned char wxLuaEditor[80024] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 13, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 13, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 80125; ! const unsigned char wxLuaEditor[80126] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 13, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 13, 10, *************** *** 1668,1675 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 70, 73, 88, 77, 69, 32,119,104,121, 32,119,111,117,108,100, 32,121,111,117, 32,119, 97,110,116, 32,116,111, 32,114,117,110, 32, 97,108,108, 32,116,104,101, 32,110,111,116,101, 98,111,111,107, 32,112, 97,103,101,115, 63, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,112, 97,105,114,115, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 41, 32,100,111, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 32, 32, 32, 32, 61, 32,100,111, 99,117,109,101,110,116, 46,101,100,105,116,111,114, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 32, 32, 32, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 84,101,120,116, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 84,101,120,116, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,100,111, 99,117,109,101,110,116, 32, 32, 32, 61, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 93, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32, 77, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,100,111, 99,117,109,101,110,116, 46,102,105,108,101, 80, 97,116,104, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,111,107, 32, 61, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 82,117,110, 40,102,105,108,101, 80, 97,116,104, 44, 32,101,100,105,116,111,114, 84,101,120,116, 41, 13, 10, --- 1668,1675 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 70, 73, 88, 77, 69, 32,119,104,121, 32,119,111,117,108,100, 32,121,111,117, 32,119, 97,110,116, 32,116,111, 32,114,117,110, 32, 97,108,108, 32,116,104,101, 32,110,111,116,101, 98,111,111,107, 32,112, 97,103,101,115, 63, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,112, 97,105,114,115, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 41, 32,100,111, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 32, 32, 32, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 32, 45, 45, 32, 77, 85, 83, 84, 32,117,115,101, 32,100,111, 99,117,109,101,110,116, 46,101,100,105,116,111,114, 32,117,115,101,114,100, 97,116, 97, 33, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,100,111, 99,117,109,101,110,116, 32, 32, 32, 61, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 93, 13, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 32, 32, 32, 32, 61, 32,100,111, 99,117,109,101,110,116, 46,101,100,105,116,111,114, 13, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 84,101,120,116, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 84,101,120,116, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32, 77, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,100,111, 99,117,109,101,110,116, 46,102,105,108,101, 80, 97,116,104, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,111,107, 32, 61, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 82,117,110, 40,102,105,108,101, 80, 97,116,104, 44, 32,101,100,105,116,111,114, 84,101,120,116, 41, 13, 10, *************** *** 1715,1719 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 49, 44, 32, 49, 41, 32, 61, 61, 32, 39, 64, 39, 32,116,104,101,110, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 50, 44, 32, 45, 49, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 73,115, 65, 98,115,111,108,117,116,101, 80, 97,116,104, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 41, 32, 61, 61, 32,102, 97,108,115,101, 32,116,104,101,110, 13, 10, --- 1715,1720 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 13, 10, ! 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 49, 44, 32, 49, 41, 32, 61, 61, 32, 39, 64, 39, 32,116,104,101,110, 32, 45, 45, 32, 70, 73, 88, 77, 69, 32,119,104, 97,116, 32,105,115, 32,116,104,105,115, 63, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 50, 44, 32, 45, 49, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 73,115, 65, 98,115,111,108,117,116,101, 80, 97,116,104, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 41, 32, 61, 61, 32,102, 97,108,115,101, 32,116,104,101,110, 13, 10, *************** *** 2054,2058 **** 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 95, 99,111,110,110,101, 99,116,101,100, 32, 61, 32,102, 97,108,115,101, 13, 10, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32,116,104,101,110, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 82,101,115,101,116, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 68,101,108,101,116,101, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32, 61, 32,110,105,108, 13, 10, --- 2055,2060 ---- 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 95, 99,111,110,110,101, 99,116,101,100, 32, 61, 32,102, 97,108,115,101, 13, 10, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32,116,104,101,110, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 45, 45,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 82,101,115,101,116, 40, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 75,105,108,108, 68,101, 98,117,103,103,101,101, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 68,101,108,101,116,101, 40, 41, 13, 10, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32, 61, 32,110,105,108, 13, 10, |
|
From: John L. <jr...@us...> - 2006-12-11 07:03:33
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6932/wxLua/bindings/wxluasocket Modified Files: wxluasocket.i Log Message: try to fix crashing in MSW while trying to kill debuggee process Index: wxluasocket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxluasocket.i 5 Oct 2006 05:10:46 -0000 1.7 --- wxluasocket.i 11 Dec 2006 07:03:30 -0000 1.8 *************** *** 38,42 **** bool EvaluateExpr(int exprRef, const wxString &expr) ! void DisplayStackDialog(wxWindow *pParent) %endclass --- 38,48 ---- bool EvaluateExpr(int exprRef, const wxString &expr) ! void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) ! ! long GetDebuggeeProcessId() const ! bool KillDebuggee() ! ! static wxString GetProgramName() ! static wxString GetNetworkName() %endclass |
|
From: John L. <jr...@us...> - 2006-12-11 04:38:32
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14617/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: don't forward declare the class in wxLUA_DECLARE_ENCAPSULATION for the case when the class is actually a "struct" as in wxVideoMode Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlbind.h 1 Dec 2006 06:25:47 -0000 1.26 --- wxlbind.h 11 Dec 2006 04:38:27 -0000 1.27 *************** *** 221,225 **** #define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, className, objName) \ - class className; \ IMPEXPSYMBOL void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, className *); \ class IMPEXPSYMBOL wxObject_##objName : public wxObject \ --- 221,224 ---- |
|
From: John L. <jr...@us...> - 2006-12-11 00:09:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7852/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: remove references to wxlua handler Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 19 Sep 2006 05:01:45 -0000 1.9 --- Makefile 11 Dec 2006 00:09:15 -0000 1.10 *************** *** 55,59 **** ../include/wxldtarg.h \ ../include/wxlsock.h \ - ../include/wxlhandl.h \ ../include/wxluasocket.h \ ../include/dservice.h --- 55,58 ---- *************** *** 63,67 **** wxldtarg.cpp \ wxlsock.cpp \ - wxlhandl.cpp \ wxluasocket.cpp \ wxluasocket_bind.cpp \ --- 62,65 ---- |
|
From: John L. <jr...@us...> - 2006-12-11 00:09:19
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7852/wxLua/docs Modified Files: dirs.txt Log Message: remove references to wxlua handler Index: dirs.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/dirs.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dirs.txt 25 Nov 2005 19:45:36 -0000 1.3 --- dirs.txt 11 Dec 2006 00:09:15 -0000 1.4 *************** *** 101,105 **** wxldbgio.h wxLuaDebugIO.h wxldserv.h wxLuaDebugServer.h ! wxlhandl.h wxLuaLibrary.h wxlsock.h wxLuaSocket.h wxldtarg.h wxLuaDebugTarget.h moved from wxLua/Standalone --- 101,105 ---- wxldbgio.h wxLuaDebugIO.h wxldserv.h wxLuaDebugServer.h ! removed wxLuaLibrary.h - debugger is a wxEvtHandler now wxlsock.h wxLuaSocket.h wxldtarg.h wxLuaDebugTarget.h moved from wxLua/Standalone *************** *** 126,130 **** wxldbgio.cpp wxLuaDebugIO.cpp wxldserv.cpp wxLuaDebugServer.cpp ! wxlhandl.cpp wxLuaLibrary.cpp wxlsock.cpp wxLuaSocket.cpp wxldtarg.cpp wxLuaDebugTarget.cpp moved from wxLua/Standalone --- 126,130 ---- wxldbgio.cpp wxLuaDebugIO.cpp wxldserv.cpp wxLuaDebugServer.cpp ! removed wxLuaLibrary.cpp wxlsock.cpp wxLuaSocket.cpp wxldtarg.cpp wxLuaDebugTarget.cpp moved from wxLua/Standalone |
|
From: John L. <jr...@us...> - 2006-12-11 00:09:19
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7852/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: remove references to wxlua handler Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxluaedit.cpp 2 Nov 2006 23:38:07 -0000 1.26 --- wxluaedit.cpp 11 Dec 2006 00:09:15 -0000 1.27 *************** *** 29,33 **** #include "wxluasocket/include/wxldserv.h" #include "wxluasocket/include/wxldtarg.h" - #include "wxluasocket/include/wxlhandl.h" #include "wxluadebug/include/staktree.h" --- 29,32 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/apps/build/msw Modified Files: apps_app_verbatimlua.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** makefile.bcc 10 Dec 2006 00:47:22 -0000 1.53 --- makefile.bcc 11 Dec 2006 00:08:18 -0000 1.54 *************** *** 194,208 **** SHARED_SUFFIX = shared !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = ..\..\..\bin\wxlua.exe !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = ..\..\..\bin\wxluaedit.exe !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif !if "$(WX_UNICODE)" == "1" --- 194,242 ---- SHARED_SUFFIX = shared !endif + !if "$(SHARED)" == "0" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_lib + !endif + !if "$(SHARED)" == "1" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_dll + !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = \ ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe ! !endif ! !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_1 = bin\bcc$(WXLIBPOSTFIX)_lib ! !endif ! !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_1 = bin\bcc$(WXLIBPOSTFIX)_dll !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = \ ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe ! !endif ! !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_2 = bin\bcc$(WXLIBPOSTFIX)_lib ! !endif ! !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_2 = bin\bcc$(WXLIBPOSTFIX)_dll !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = \ ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe ! !endif ! !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_3 = bin\bcc$(WXLIBPOSTFIX)_lib ! !endif ! !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_3 = bin\bcc$(WXLIBPOSTFIX)_dll !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = \ ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe ! !endif ! !if "$(SHARED)" == "0" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_lib ! !endif ! !if "$(SHARED)" == "1" ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif !if "$(WX_UNICODE)" == "1" *************** *** 338,350 **** __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif - !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 372,375 ---- *************** *** 359,362 **** --- 384,396 ---- ____BUILD_4 = -v- !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif *************** *** 367,371 **** ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 401,405 ---- ### Targets: ### ! all: ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 373,408 **** -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe ! -if exist ..\..\..\bin\wxlua-lua.tds del ..\..\..\bin\wxlua-lua.tds ! -if exist ..\..\..\bin\wxlua-lua.ilc del ..\..\..\bin\wxlua-lua.ilc ! -if exist ..\..\..\bin\wxlua-lua.ild del ..\..\..\bin\wxlua-lua.ild ! -if exist ..\..\..\bin\wxlua-lua.ilf del ..\..\..\bin\wxlua-lua.ilf ! -if exist ..\..\..\bin\wxlua-lua.ils del ..\..\..\bin\wxlua-lua.ils ! -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! -if exist ..\..\..\bin\wxlua.tds del ..\..\..\bin\wxlua.tds ! -if exist ..\..\..\bin\wxlua.ilc del ..\..\..\bin\wxlua.ilc ! -if exist ..\..\..\bin\wxlua.ild del ..\..\..\bin\wxlua.ild ! -if exist ..\..\..\bin\wxlua.ilf del ..\..\..\bin\wxlua.ilf ! -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe ! -if exist ..\..\..\bin\wxluaedit.tds del ..\..\..\bin\wxluaedit.tds ! -if exist ..\..\..\bin\wxluaedit.ilc del ..\..\..\bin\wxluaedit.ilc ! -if exist ..\..\..\bin\wxluaedit.ild del ..\..\..\bin\wxluaedit.ild ! -if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf ! -if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils ! -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe ! -if exist ..\..\..\bin\wxluacan.tds del ..\..\..\bin\wxluacan.tds ! -if exist ..\..\..\bin\wxluacan.ilc del ..\..\..\bin\wxluacan.ilc ! -if exist ..\..\..\bin\wxluacan.ild del ..\..\..\bin\wxluacan.ild ! -if exist ..\..\..\bin\wxluacan.ilf del ..\..\..\bin\wxluacan.ilf ! -if exist ..\..\..\bin\wxluacan.ils del ..\..\..\bin\wxluacan.ils ! -if exist ..\..\..\bin\wxluafreeze.exe del ..\..\..\bin\wxluafreeze.exe ! -if exist ..\..\..\bin\wxluafreeze.tds del ..\..\..\bin\wxluafreeze.tds ! -if exist ..\..\..\bin\wxluafreeze.ilc del ..\..\..\bin\wxluafreeze.ilc ! -if exist ..\..\..\bin\wxluafreeze.ild del ..\..\..\bin\wxluafreeze.ild ! -if exist ..\..\..\bin\wxluafreeze.ilf del ..\..\..\bin\wxluafreeze.ilf ! -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils ! ..\..\..\bin\wxlua-lua.exe: $(APP_VERBATIMLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| c0x32.obj $(APP_VERBATIMLUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, --- 407,442 ---- -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.ils ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.ils ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.ils ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.ils ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.tds ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ilc del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ilc ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ild del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ild ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ilf del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ilf ! -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.ils ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe: $(APP_VERBATIMLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| c0x32.obj $(APP_VERBATIMLUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, *************** *** 410,414 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res --- 444,448 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res *************** *** 417,421 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res --- 451,455 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res *************** *** 424,428 **** !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res --- 458,462 ---- !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res *************** *** 431,435 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res --- 465,469 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** apps_app_wxlua.dsp 10 Dec 2006 00:47:21 -0000 1.27 --- apps_app_wxlua.dsp 11 Dec 2006 00:08:18 -0000 1.28 *************** *** 48,61 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 48,61 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vcud_dll" # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 73,86 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 73,86 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vcud_dll" # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 98,111 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 --- 98,111 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vcu_dll" # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 123,136 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 --- 123,136 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vcu_dll" # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" *************** *** 148,161 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 148,161 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vcd_dll" # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" *************** *** 173,186 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 173,186 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vcd_dll" # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" *************** *** 198,211 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 --- 198,211 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" *************** *** 223,236 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 --- 223,236 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** makefile.vc 8 Dec 2006 13:19:58 -0000 1.35 --- makefile.vc 11 Dec 2006 00:08:19 -0000 1.36 *************** *** 118,130 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif !if "$(SHARED)" == "0" SHARED_SUFFIX = static --- 118,121 ---- *************** *** 133,139 **** --- 124,145 ---- SHARED_SUFFIX = shared !endif + !if "$(SHARED)" == "0" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_lib + !endif + !if "$(SHARED)" == "1" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_dll + !endif !if "$(USE_APPS)" == "1" __apps___depname = sub_apps !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif *************** *** 144,148 **** ### Targets: ### ! all: ..\..\lib\vc_lib ..\..\lib\vc_dll ..\..\bin sub_modules $(__apps___depname) clean: --- 150,154 ---- ### Targets: ### ! all: ..\..\lib\vc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\vc_lib sub_modules $(__apps___depname) clean: *************** *** 157,168 **** cd $(MAKEDIR) - ..\..\lib\vc_lib: - if not exist ..\..\lib\vc_lib mkdir ..\..\lib\vc_lib - ..\..\lib\vc_dll: if not exist ..\..\lib\vc_dll mkdir ..\..\lib\vc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin sub_modules: --- 163,174 ---- cd $(MAKEDIR) ..\..\lib\vc_dll: if not exist ..\..\lib\vc_dll mkdir ..\..\lib\vc_dll ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ! ..\..\lib\vc_lib: ! if not exist ..\..\lib\vc_lib mkdir ..\..\lib\vc_lib sub_modules: Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** makefile.bcc 8 Dec 2006 13:19:58 -0000 1.32 --- makefile.bcc 11 Dec 2006 00:08:19 -0000 1.33 *************** *** 168,180 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = ud - !endif - !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" - WXLIBPOSTFIX = d - !endif - !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" - WXLIBPOSTFIX = u - !endif !if "$(BUILD)" == "debug" WX_DEBUG = 1 --- 168,171 ---- *************** *** 195,201 **** --- 186,207 ---- SHARED_SUFFIX = shared !endif + !if "$(SHARED)" == "0" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_lib + !endif + !if "$(SHARED)" == "1" + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\bcc$(WXLIBPOSTFIX)_dll + !endif !if "$(USE_APPS)" == "1" __apps___depname = apps !endif + !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" + WXLIBPOSTFIX = d + !endif + !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" + WXLIBPOSTFIX = ud + !endif *************** *** 206,210 **** ### Targets: ### ! all: ..\..\lib\bcc_lib ..\..\lib\bcc_dll ..\..\bin modules $(__apps___depname) clean: --- 212,216 ---- ### Targets: ### ! all: ..\..\lib\bcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\bcc_lib modules $(__apps___depname) clean: *************** *** 221,232 **** @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat - ..\..\lib\bcc_lib: - if not exist ..\..\lib\bcc_lib mkdir ..\..\lib\bcc_lib - ..\..\lib\bcc_dll: if not exist ..\..\lib\bcc_dll mkdir ..\..\lib\bcc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin modules: --- 227,238 ---- @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_dll: if not exist ..\..\lib\bcc_dll mkdir ..\..\lib\bcc_dll ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ! ..\..\lib\bcc_lib: ! if not exist ..\..\lib\bcc_lib mkdir ..\..\lib\bcc_lib modules: Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** makefile.wat 8 Dec 2006 13:19:58 -0000 1.34 --- makefile.wat 11 Dec 2006 00:08:19 -0000 1.35 *************** *** 119,133 **** ### Conditionally set variables: ### ! WXLIBPOSTFIX = ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 --- 119,141 ---- ### Conditionally set variables: ### ! SHARED_SUFFIX = ! !ifeq SHARED 0 ! SHARED_SUFFIX = static !endif + !ifeq SHARED 1 + SHARED_SUFFIX = shared !endif ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = ! !ifeq SHARED 0 ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\wat$(WXLIBPOSTFIX)_lib ! !endif ! !ifeq SHARED 1 ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\wat$(WXLIBPOSTFIX)_dll !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps !endif + WXLIBPOSTFIX = !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 *************** *** 135,148 **** !endif !endif ! SHARED_SUFFIX = ! !ifeq SHARED 0 ! SHARED_SUFFIX = static !endif - !ifeq SHARED 1 - SHARED_SUFFIX = shared !endif ! __apps___depname = ! !ifeq USE_APPS 1 ! __apps___depname = apps !endif --- 143,155 ---- !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 ! WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud ! !endif !endif *************** *** 168,172 **** ### Targets: ### ! all : .SYMBOLIC ..\..\lib\wat_lib ..\..\lib\wat_dll ..\..\bin modules $(__apps___depname) clean : .SYMBOLIC --- 175,179 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\lib\wat_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\wat_lib modules $(__apps___depname) clean : .SYMBOLIC *************** *** 183,194 **** cd $(WATCOM_CWD) - ..\..\lib\wat_lib : - if not exist ..\..\lib\wat_lib mkdir ..\..\lib\wat_lib - ..\..\lib\wat_dll : if not exist ..\..\lib\wat_dll mkdir ..\..\lib\wat_dll ! ..\..\bin : ! if not exist ..\..\bin mkdir ..\..\bin modules : .SYMBOLIC --- 190,201 ---- cd $(WATCOM_CWD) ..\..\lib\wat_dll : if not exist ..\..\lib\wat_dll mkdir ..\..\lib\wat_dll ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) : ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ! ..\..\lib\wat_lib : ! if not exist ..\..\lib\wat_lib mkdir ..\..\lib\wat_lib modules : .SYMBOLIC Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.gcc 8 Dec 2006 13:19:58 -0000 1.33 --- makefile.gcc 11 Dec 2006 00:08:19 -0000 1.34 *************** *** 108,120 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d endif endif ifeq ($(WX_DEBUG),0) --- 108,125 ---- ### Conditionally set variables: ### ! ifeq ($(SHARED),0) ! SHARED_SUFFIX = static endif + ifeq ($(SHARED),1) + SHARED_SUFFIX = shared endif ! ifeq ($(SHARED),0) ! __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\gcc$(WXLIBPOSTFIX)_lib endif + ifeq ($(SHARED),1) + __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\gcc$(WXLIBPOSTFIX)_dll + endif + ifeq ($(USE_APPS),1) + __apps___depname = apps endif ifeq ($(WX_DEBUG),0) *************** *** 123,134 **** endif endif ! ifeq ($(SHARED),0) ! SHARED_SUFFIX = static endif - ifeq ($(SHARED),1) - SHARED_SUFFIX = shared endif ! ifeq ($(USE_APPS),1) ! __apps___depname = apps endif --- 128,140 ---- endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) ! WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud ! endif endif *************** *** 140,144 **** ### Targets: ### ! all: ..\..\lib\gcc_lib ..\..\lib\gcc_dll ..\..\bin modules $(__apps___depname) clean: --- 146,150 ---- ### Targets: ### ! all: ..\..\lib\gcc_dll ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ..\..\lib\gcc_lib modules $(__apps___depname) clean: *************** *** 148,159 **** $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean - ..\..\lib\gcc_lib: - if not exist ..\..\lib\gcc_lib mkdir ..\..\lib\gcc_lib - ..\..\lib\gcc_dll: if not exist ..\..\lib\gcc_dll mkdir ..\..\lib\gcc_dll ! ..\..\bin: ! if not exist ..\..\bin mkdir ..\..\bin modules: --- 154,165 ---- $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ..\..\lib\gcc_dll: if not exist ..\..\lib\gcc_dll mkdir ..\..\lib\gcc_dll ! ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES): ! if not exist ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) mkdir ..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES) ! ! ..\..\lib\gcc_lib: ! if not exist ..\..\lib\gcc_lib mkdir ..\..\lib\gcc_lib modules: |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/build/bakefiles Modified Files: common.bkl Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** common.bkl 10 Dec 2006 00:47:23 -0000 1.7 --- common.bkl 11 Dec 2006 00:08:19 -0000 1.8 *************** *** 102,105 **** --- 102,115 ---- <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> + <!-- Note that for "LUA" module there's nothing wx-related and it's already a + very fast block of sources to compile so that we don't need PCH --> + <if cond="__modname!='LUA'"> + <precomp-headers-gen>$(__modnamelow)/src/dummy.cpp</precomp-headers-gen> + <precomp-headers-location>include</precomp-headers-location> + <precomp-headers-header>wx/wxprec.h</precomp-headers-header> + <precomp-headers-file>wxprec_$(id)</precomp-headers-file> + <precomp-headers>on</precomp-headers> + </if> + <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> *************** *** 145,148 **** --- 155,171 ---- <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> + <!-- Note that for "LUA" module there's nothing wx-related and it's already a + very fast block of sources to compile so that we don't need PCH --> + <if cond="__modname!='LUA'"> + <precomp-headers-gen>$(__modnamelow)/src/dummy.cpp</precomp-headers-gen> + <precomp-headers-location>include</precomp-headers-location> + <precomp-headers-header>wx/wxprec.h</precomp-headers-header> + <precomp-headers-file>wxprec_$(id)</precomp-headers-file> + <precomp-headers>on</precomp-headers> + </if> + + <include>$(SRCDIR)/include</include> + <dirname>$(SRCDIR)/lib</dirname> + <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** autoconf_inc.m4 8 Dec 2006 13:19:57 -0000 1.19 --- autoconf_inc.m4 11 Dec 2006 00:08:19 -0000 1.20 *************** *** 7,10 **** --- 7,12 ---- BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" + dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../modules/build/bakefiles/modules.bkl] ### + AC_BAKEFILE_PRECOMP_HEADERS dnl ### begin block 20_COND_BUILD_DEBUG[../../util/build/bakefiles/util.bkl] ### COND_BUILD_DEBUG="#" *************** *** 49,52 **** --- 51,66 ---- fi AC_SUBST(COND_DEPS_TRACKING_1) + dnl ### begin block 20_COND_GCC_PCH_1[../../modules/build/bakefiles/modules.bkl] ### + COND_GCC_PCH_1="#" + if test "x$GCC_PCH" = "x1" ; then + COND_GCC_PCH_1="" + fi + AC_SUBST(COND_GCC_PCH_1) + dnl ### begin block 20_COND_ICC_PCH_1[../../modules/build/bakefiles/modules.bkl] ### + COND_ICC_PCH_1="#" + if test "x$ICC_PCH" = "x1" ; then + COND_ICC_PCH_1="" + fi + AC_SUBST(COND_ICC_PCH_1) dnl ### begin block 20_COND_INSTALL_CUSTOM_WXBIND_1[../../modules/build/bakefiles/modules.bkl] ### COND_INSTALL_CUSTOM_WXBIND_1="#" *************** *** 175,178 **** --- 189,198 ---- fi AC_SUBST(COND_USE_BIN2C_1) + dnl ### begin block 20_COND_USE_PCH_1[../../modules/build/bakefiles/modules.bkl] ### + COND_USE_PCH_1="#" + if test "x$USE_PCH" = "x1" ; then + COND_USE_PCH_1="" + fi + AC_SUBST(COND_USE_PCH_1) dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOSYMLINKS_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** configure.ac 10 Dec 2006 00:47:22 -0000 1.32 --- configure.ac 11 Dec 2006 00:08:19 -0000 1.33 *************** *** 344,353 **** fi - # Create the output folders in the current build directory - # (this handles cases like: - # mkdir mybuild && cd mybuild && ../configure && make ) - AS_MKDIR_P(lib) - AS_MKDIR_P(bin) - AC_OUTPUT --- 344,347 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:53
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules Modified Files: Makefile.in Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Makefile.in 10 Dec 2006 00:47:22 -0000 1.49 --- Makefile.in 11 Dec 2006 00:08:19 -0000 1.50 *************** *** 27,30 **** --- 27,31 ---- INSTALL_DIR = @INSTALL_DIR@ BK_DEPS = @BK_DEPS@ + BK_MAKE_PCH = @BK_MAKE_PCH@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ *************** *** 96,101 **** lua/include/lualib.h VERBATIMLUA_DLL_CFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ [...1490 lines suppressed...] $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp ! wxluasocket_dll_wxlsock.o: $(srcdir)/wxluasocket/src/wxlsock.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp ! wxluasocket_dll_dummy.o: $(srcdir)/wxluasocket/src/dummy.cpp $(WXLUASOCKET_DLL_ODEP) ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/dummy.cpp ! ! wxluasocket_dll_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp ! wxluasocket_dll_wxldserv.o: $(srcdir)/wxluasocket/src/wxldserv.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldserv.cpp ! wxluasocket_dll_dservice.o: $(srcdir)/wxluasocket/src/dservice.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/dservice.cpp ! wxluasocket_dll_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp |
