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...> - 2008-01-20 19:23:34
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/build/msvc6 Modified Files: wxLua.dsw Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxLua.dsw 14 Aug 2007 13:42:14 -0000 1.10 --- wxLua.dsw 20 Jan 2008 19:23:01 -0000 1.11 *************** *** 487,490 **** --- 487,547 ---- ############################################################################### + Project: "mod_luamodule_mono"=..\..\modules\build\msvc6\modules_mod_luamodule_mono.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name mod_lua + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxlua + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindbase + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindcore + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindnet + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindadv + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindaui + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindgl + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindhtml + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindmedia + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindstc + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindxml + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxbindxrc + 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 + }}} + + ############################################################################### + Global: |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:34
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/bindings/wxwidgets Modified Files: wxcore_appframe.i wxcore_override.hpp Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxcore_appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_appframe.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_appframe.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxcore_appframe.i 20 Jan 2008 19:23:00 -0000 1.4 *************** *** 43,47 **** // bool Initialized() obsolete in wxWidgets ! // %override int wxApp::MainLoop() Only calls it if !IsMainLoopRunning(), returns 0 if it already is // C++ Func: int MainLoop() int MainLoop() --- 43,47 ---- // bool Initialized() obsolete in wxWidgets ! // %override int wxApp::MainLoop() : Only calls it if !wxLuaState::sm_wxAppMainLoop_will_run, returns 0 if it is true. // C++ Func: int MainLoop() int MainLoop() Index: wxcore_override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxcore_override.hpp 3 Jan 2008 00:05:56 -0000 1.16 --- wxcore_override.hpp 20 Jan 2008 19:23:00 -0000 1.17 *************** *** 29,34 **** // get this wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp); ! // call MainLoop ! int returns = !wxApp::IsMainLoopRunning() ? (self->MainLoop()) : 0; // push the result number lua_pushnumber(L, returns); --- 29,37 ---- // get this wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp); ! int returns = 0; ! ! if (!wxLuaState::sm_wxAppMainLoop_will_run) ! returns = self->MainLoop(); ! // push the result number lua_pushnumber(L, returns); |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:34
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/apps/wxluafreeze/src Modified Files: wxluafreeze.cpp Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluafreeze.cpp 17 Jan 2008 15:19:57 -0000 1.15 --- wxluafreeze.cpp 20 Jan 2008 19:23:00 -0000 1.16 *************** *** 124,127 **** --- 124,132 ---- m_fileName = argv[0]; // the filename of 'this' program + // When this function returns wxApp:MainLoop() will be called by wxWidgets + // and so we want the Lua code wx.wxGetApp:MailLoop() to not + // prematurely start it. + wxLuaState::sm_wxAppMainLoop_will_run = true; + m_wxlState = wxLuaState(this, wxID_ANY); if (!m_wxlState.Ok()) |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:34
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** wxlua.cpp 15 Jan 2008 06:31:05 -0000 1.51 --- wxlua.cpp 20 Jan 2008 19:23:00 -0000 1.52 *************** *** 149,152 **** --- 149,156 ---- WXLUA_IMPLEMENT_BIND_ALL + // When this function returns wxApp:MainLoop() will be called by wxWidgets + // and so we want the Lua code wx.wxGetApp:MailLoop() to not + // prematurely start it. + wxLuaState::sm_wxAppMainLoop_will_run = true; m_wxlState = wxLuaState(this, wxID_ANY); |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:06
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/docs Modified Files: changelog.txt wxluaref.html Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxluaref.html 1 Jan 2008 18:27:48 -0000 1.46 --- wxluaref.html 20 Jan 2008 19:23:01 -0000 1.47 *************** *** 6815,6819 **** <font color=#009900>// bool Initialized() obsolete in wxWidgets</font><br> <br> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> int wxApp::MainLoop() Only calls it if !IsMainLoopRunning(), returns 0 if it already is</font></font><br> <font color=#009900>// C++ Func: int MainLoop()</font><br> int MainLoop()<br> --- 6815,6819 ---- <font color=#009900>// bool Initialized() obsolete in wxWidgets</font><br> <br> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> int wxApp::MainLoop() : Only calls it if !wxLuaState::sm_wxAppMainLoop_will_run, returns 0 if it is true.</font></font><br> <font color=#009900>// C++ Func: int MainLoop()</font><br> int MainLoop()<br> *************** *** 7569,7574 **** <blockquote> <a href="#wxChoice">wxChoice</a>()<br> ! <a href="#wxChoice">wxChoice</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxChoice")<br> ! bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxChoice")<br> <br> int GetCurrentSelection() const<br> --- 7569,7574 ---- <blockquote> <a href="#wxChoice">wxChoice</a>()<br> ! <a href="#wxChoice">wxChoice</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxChoice")<br> ! bool Create(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxChoice")<br> <br> int GetCurrentSelection() const<br> *************** *** 7594,7599 **** <blockquote> <a href="#wxComboBox">wxComboBox</a>()<br> ! <a href="#wxComboBox">wxComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxComboBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxComboBox")<br> <br> bool CanCopy() const<br> --- 7594,7599 ---- <blockquote> <a href="#wxComboBox">wxComboBox</a>()<br> ! <a href="#wxComboBox">wxComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxComboBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxComboBox")<br> <br> bool CanCopy() const<br> *************** *** 7672,7677 **** <blockquote> <a href="#wxListBox">wxListBox</a>()<br> ! <a href="#wxListBox">wxListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxListBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxListBox")<br> <br> void Deselect(int n)<br> --- 7672,7677 ---- <blockquote> <a href="#wxListBox">wxListBox</a>()<br> ! <a href="#wxListBox">wxListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxListBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxListBox")<br> <br> void Deselect(int n)<br> *************** *** 7702,7707 **** <blockquote> <a href="#wxCheckListBox">wxCheckListBox</a>()<br> ! <a href="#wxCheckListBox">wxCheckListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckListBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckListBox")<br> <br> void Check(int item, bool check = true)<br> --- 7702,7707 ---- <blockquote> <a href="#wxCheckListBox">wxCheckListBox</a>()<br> ! <a href="#wxCheckListBox">wxCheckListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckListBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckListBox")<br> <br> void Check(int item, bool check = true)<br> *************** *** 8019,8024 **** <blockquote> <a href="#wxRadioBox">wxRadioBox</a>()<br> ! <a href="#wxRadioBox">wxRadioBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> <br> <font color=#009900>// these are marked deprecated in 2.6, use wxWindow::Get/SetLabel and Get/SetString below</font><br> --- 8019,8024 ---- <blockquote> <a href="#wxRadioBox">wxRadioBox</a>()<br> ! <a href="#wxRadioBox">wxRadioBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> <br> <font color=#009900>// these are marked deprecated in 2.6, use wxWindow::Get/SetLabel and Get/SetString below</font><br> *************** *** 15162,15166 **** <br> <i>%include</i> "wxlua/include/wxlua_bind.h" <font color=#009900>// for <a href="#wxLuaObject">wxLuaObject</a> tag</font><br> ! <i>%include</i> "wxbind/include/wxcore_wxlprint.h"<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b> --- 15162,15166 ---- <br> <i>%include</i> "wxlua/include/wxlua_bind.h" <font color=#009900>// for <a href="#wxLuaObject">wxLuaObject</a> tag</font><br> ! <i>%include</i> "wxbind/include/wxcore_wxlcore.h"<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxLuaPrintout">wxLuaPrintout</a>, <a href="#wxPrintout">wxPrintout</a></font></b> *************** *** 15189,15192 **** --- 15189,15194 ---- virtual <a href="#wxString">wxString</a> TestVirtualFunctionBinding(const <a href="#wxString">wxString</a>& val) <font color=#009900>// { return val + wxT("-Base"); }</font><br> <br> + <font color=#CC6600> <i>%member</i> static int ms_test_int</font><br> + <br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 17112,17116 **** <a href="#wxStaticBitmap">wxStaticBitmap</a>()<br> <a href="#wxStaticBitmap">wxStaticBitmap</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxBitmap">wxBitmap</a>& label = wxNullBitmap, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticBitmap")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxBitmap">wxBitmap</a>& label = wxNullBitmap, const <a href="#wxPoint">wxPoint</a>& pos, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticBitmap")<br> <br> <a href="#wxBitmap">wxBitmap</a> GetBitmap() const<br> --- 17114,17118 ---- <a href="#wxStaticBitmap">wxStaticBitmap</a>()<br> <a href="#wxStaticBitmap">wxStaticBitmap</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxBitmap">wxBitmap</a>& label = wxNullBitmap, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticBitmap")<br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxBitmap">wxBitmap</a>& label = wxNullBitmap, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a>& name = "wxStaticBitmap")<br> <br> <a href="#wxBitmap">wxBitmap</a> GetBitmap() const<br> *************** *** 17324,17330 **** <a href="#wxBitmapComboBox">wxBitmapComboBox</a>()<br> <font color=#009900>//<a href="#wxBitmapComboBox">wxBitmapComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, int n = 0, const <a href="#wxString">wxString</a> choices[] = NULL, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "comboBox")</font><br> ! <a href="#wxBitmapComboBox">wxBitmapComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")<br> <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, int n, const <a href="#wxString">wxString</a> choices[], long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")</font><br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")<br> <br> int Append(const <a href="#wxString">wxString</a>& item, const <a href="#wxBitmap">wxBitmap</a>& bitmap = wxNullBitmap)<br> --- 17326,17332 ---- <a href="#wxBitmapComboBox">wxBitmapComboBox</a>()<br> <font color=#009900>//<a href="#wxBitmapComboBox">wxBitmapComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, int n = 0, const <a href="#wxString">wxString</a> choices[] = NULL, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "comboBox")</font><br> ! <a href="#wxBitmapComboBox">wxBitmapComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")<br> <font color=#009900>//bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, int n, const <a href="#wxString">wxString</a> choices[], long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")</font><br> ! bool Create(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const <a href="#wxArrayString">wxArrayString</a>& choices = wxLuaNullSmart<a href="#wxArrayString">wxArrayString</a>, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapComboBox")<br> <br> int Append(const <a href="#wxString">wxString</a>& item, const <a href="#wxBitmap">wxBitmap</a>& bitmap = wxNullBitmap)<br> *************** *** 17808,17812 **** bool IsIconInstalled()<br> <i>%wxchkver_2_4</i> bool IsOk()<br> ! <font color=#009900>// virtual bool PopupMenu(<a href="#wxMenu">wxMenu</a>* menu)</font><br> <br> <font color=#009900>// call RemoveIcon() or delete this if you want your program to exit, must have called SetIcon()</font><br> --- 17810,17814 ---- bool IsIconInstalled()<br> <i>%wxchkver_2_4</i> bool IsOk()<br> ! virtual bool PopupMenu(<a href="#wxMenu">wxMenu</a>* menu)<br> <br> <font color=#009900>// call RemoveIcon() or delete this if you want your program to exit, must have called SetIcon()</font><br> *************** *** 19378,19386 **** <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> <a href="#wxGLContext">wxGLContext</a>* GetContext() const<br> ! void SetCurrent()<br> ! <i>%wxchkver_2_8</i> void SetCurrent(const <a href="#wxGLContext">wxGLContext</a>& RC) const<br> void SetColour(const <a href="#wxString">wxString</a>& colour)<br> void SwapBuffers()<br> --- 19380,19388 ---- <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! !<i>%mac</i> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> <a href="#wxGLContext">wxGLContext</a>* GetContext() const<br> ! <i>%mac</i> void SetCurrent()<br> ! <i>%wxchkver_2_8</i>&!<i>%mac</i> void SetCurrent(const <a href="#wxGLContext">wxGLContext</a>& RC) const<br> void SetColour(const <a href="#wxString">wxString</a>& colour)<br> void SwapBuffers()<br> *************** *** 19394,19405 **** <br> <i>%if</i> <i>%wxchkver_2_8</i><br> ! <a href="#wxGLContext">wxGLContext</a>(<a href="#wxGLCanvas">wxGLCanvas</a> *win, const <a href="#wxGLContext">wxGLContext</a>* other = NULL )<br> <br> ! void SetCurrent(const <a href="#wxGLCanvas">wxGLCanvas</a>& win) const<br> <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> <br> <i>%if</i> !<i>%wxchkver_2_8</i><br> <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette, const <a href="#wxGLContext">wxGLContext</a>* other)<br> <br> const <a href="#wxWindow">wxWindow</a>* GetWindow()<br> --- 19396,19408 ---- <br> <i>%if</i> <i>%wxchkver_2_8</i><br> ! !<i>%mac</i> <a href="#wxGLContext">wxGLContext</a>(<a href="#wxGLCanvas">wxGLCanvas</a> *win, const <a href="#wxGLContext">wxGLContext</a>* other = NULL ) <font color=#009900>// FIXME</font><br> <br> ! !<i>%mac</i> void SetCurrent(const <a href="#wxGLCanvas">wxGLCanvas</a>& win) const<br> ! <i>%mac</i> void SetCurrent() const<br> <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> <br> <i>%if</i> !<i>%wxchkver_2_8</i><br> <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLContext">wxGLContext</a>(bool isRGB, <a href="#wxGLCanvas">wxGLCanvas</a>* win, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette, const <a href="#wxGLContext">wxGLContext</a>* other = NULL)<br> <br> const <a href="#wxWindow">wxWindow</a>* GetWindow()<br> *************** *** 19652,19656 **** wxAUI_NB_CLOSE_ON_ACTIVE_TAB<br> wxAUI_NB_CLOSE_ON_ALL_TABS<br> ! wxAUI_NB_MIDDLE_CLICK_CLOSE<br> <br> wxAUI_NB_DEFAULT_STYLE <font color=#009900>//= wxAUI_NB_TOP|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_MIDDLE_CLICK_CLOSE</font><br> --- 19655,19659 ---- wxAUI_NB_CLOSE_ON_ACTIVE_TAB<br> wxAUI_NB_CLOSE_ON_ALL_TABS<br> ! <i>%wxchkver_2_8_6</i> wxAUI_NB_MIDDLE_CLICK_CLOSE<br> <br> wxAUI_NB_DEFAULT_STYLE <font color=#009900>//= wxAUI_NB_TOP|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_MIDDLE_CLICK_CLOSE</font><br> *************** *** 19841,19846 **** void SetTabOffset(size_t offset);<br> <br> ! bool IsTabVisible(int tabPage, int tabOffset, <a href="#wxDC">wxDC</a>* dc, <a href="#wxWindow">wxWindow</a>* wnd);<br> ! void MakeTabVisible(int tabPage, <a href="#wxWindow">wxWindow</a>* win);<br> <br> <i>%wxchkver_2_8_5</i> bool IsDragging() const<br> --- 19844,19849 ---- void SetTabOffset(size_t offset);<br> <br> ! <i>%wxchkver_2_8_6</i> bool IsTabVisible(int tabPage, int tabOffset, <a href="#wxDC">wxDC</a>* dc, <a href="#wxWindow">wxWindow</a>* wnd);<br> ! <i>%wxchkver_2_8_6</i> void MakeTabVisible(int tabPage, <a href="#wxWindow">wxWindow</a>* win);<br> <br> <i>%wxchkver_2_8_5</i> bool IsDragging() const<br> *************** *** 20836,20840 **** <i>%if</i> wxLUA_USE_wxLuaHtmlWindow<br> <br> ! <i>%include</i> "wxbind/include/wxhtml_wxlhtmlwin.h"<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxLuaHtmlWindow">wxLuaHtmlWindow</a>, <a href="#wxHtmlWindow">wxHtmlWindow</a></font></b> --- 20839,20843 ---- <i>%if</i> wxLUA_USE_wxLuaHtmlWindow<br> <br> ! <i>%include</i> "wxbind/include/wxhtml_wxlhtml.h"<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxLuaHtmlWindow">wxLuaHtmlWindow</a>, <a href="#wxHtmlWindow">wxHtmlWindow</a></font></b> *************** *** 24482,24503 **** <font color=#009900>// Get information about the status of wxLua.</font><br> <br> ! <font color=#009900>// Get a table of all tracked top level windows that wxLua will Destroy()</font><br> ! <font color=#009900>// when lua is closed.</font><br> <font color=#009900>// Example output : { "ClassName(&win id=wxWindowID)", ...}</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedWindowInfo()</font><br> <br> ! <font color=#009900>// Get a table of all tracked userdata wxLua will delete when lua is closed</font><br> ! <font color=#009900>// or lua will eventually garbage collect.</font><br> <font color=#009900>// Example output : { "ClassName(&obj)", ... }</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetGCUserdataInfo()</font><br> <br> ! <font color=#009900>// Get a table of all tracked <a href="#wxEvent">wxEvent</a> callbacks that have been installed using</font><br> ! <font color=#009900>// wxEvtHandler::Connect(...)</font><br> <font color=#009900>// "wxEVT_XXX(evt#) -> wxLuaEventCallback(&callback, ids <i>%d</i> <i>%d</i>)|<a href="#wxEvtHandler">wxEvtHandler</a>(&evthandler) -> wxEvtHandlerClassName"</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedEventCallbackInfo()</font><br> <br> ! <font color=#009900>// Get a table of all <a href="#wxWindow">wxWindow</a> derived classes that have been created in wxLua.</font><br> <font color=#009900>// "wxWindowClassName(&win, id=<i>%d</i>)|wxLuaDestroyCallback(&callback)"</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedWinDestroyCallbackInfo()</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 24485,24511 ---- <font color=#009900>// Get information about the status of wxLua.</font><br> <br> ! <font color=#009900>// Get a table or string of all tracked top level windows that wxLua will</font><br> ! <font color=#009900>// Destroy() when lua is closed.</font><br> <font color=#009900>// Example output : { "ClassName(&win id=wxWindowID)", ...}</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedWindowInfo(bool as_string = false)</font><br> <br> ! <font color=#009900>// Get a table or string of all tracked userdata wxLua will delete when lua</font><br> ! <font color=#009900>// is closed or lua will eventually garbage collect.</font><br> <font color=#009900>// Example output : { "ClassName(&obj)", ... }</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetGCUserdataInfo(bool as_string = false)</font><br> <br> ! <font color=#009900>// Get a table or string of all tracked userdata wxLua has pushed.</font><br> ! <font color=#009900>// A single object may have multiple types if it has been casted.</font><br> ! <font color=#009900>// Example output : { "&obj wxLuaTypeName(type#), ...", ... }</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedObjectInfo(bool as_string = false)</font><br> ! <br> ! <font color=#009900>// Get a table or string of all tracked <a href="#wxEvent">wxEvent</a> callbacks that have been</font><br> ! <font color=#009900>// installed using wxEvtHandler::Connect(...)</font><br> <font color=#009900>// "wxEVT_XXX(evt#) -> wxLuaEventCallback(&callback, ids <i>%d</i> <i>%d</i>)|<a href="#wxEvtHandler">wxEvtHandler</a>(&evthandler) -> wxEvtHandlerClassName"</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedEventCallbackInfo(bool as_string = false)</font><br> <br> ! <font color=#009900>// Get a table or string of all <a href="#wxWindow">wxWindow</a> derived classes that have been created in wxLua.</font><br> <font color=#009900>// "wxWindowClassName(&win, id=<i>%d</i>)|wxLuaDestroyCallback(&callback)"</font><br> ! <font color=#AA0000><i>%function</i> LuaTable GetTrackedWinDestroyCallbackInfo(bool as_string = false)</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** changelog.txt 18 Jan 2008 06:00:08 -0000 1.58 --- changelog.txt 20 Jan 2008 19:23:01 -0000 1.59 *************** *** 124,127 **** --- 124,132 ---- * Updated Lua to 5.1.3-rc1 + - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code + that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders + should call it if they create a wxLuaState and run Lua code from + their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. + version 2.8.4.2 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** wxlstate.cpp 18 Jan 2008 03:43:00 -0000 1.163 --- wxlstate.cpp 20 Jan 2008 19:23:02 -0000 1.164 *************** *** 2218,2221 **** --- 2218,2223 ---- wxHashMapLuaState wxLuaState::s_wxHashMapLuaState; + bool wxLuaState::sm_wxAppMainLoop_will_run = false; + #define M_WXLSTATEDATA ((wxLuaStateRefData*)m_refData) |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/modules/wxbind/src Modified Files: wxcore_appframe.cpp Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxcore_appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_appframe.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxcore_appframe.cpp 22 Dec 2007 06:07:12 -0000 1.8 --- wxcore_appframe.cpp 20 Jan 2008 19:23:01 -0000 1.9 *************** *** 197,202 **** // get this wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp); ! // call MainLoop ! int returns = !wxApp::IsMainLoopRunning() ? (self->MainLoop()) : 0; // push the result number lua_pushnumber(L, returns); --- 197,205 ---- // get this wxApp * self = (wxApp *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxApp); ! int returns = 0; ! ! if (!wxLuaState::sm_wxAppMainLoop_will_run) ! returns = self->MainLoop(); ! // push the result number lua_pushnumber(L, returns); |
|
From: John L. <jr...@us...> - 2008-01-20 19:23:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: - Added static bool wxLuaState::sm_wxAppMainLoop_will_run so that Lua code that calls "wx.wxGetApp:MainLoop()" will not do anything. C++ coders should call it if they create a wxLuaState and run Lua code from their wxApp:OnInit() when wxApp:IsMainLoopRunning() returns false. Added luamodule_mono to wxLua.dsw Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** wxlstate.h 15 Jan 2008 01:04:04 -0000 1.115 --- wxlstate.h 20 Jan 2008 19:23:01 -0000 1.116 *************** *** 755,758 **** --- 755,773 ---- // ----------------------------------------------------------------------- + // In order for wxLua scripts to work from a C++ program's wxApp::OnInit() + // and the Lua module you may have to set this variable to force the wxLua + // code "wx.wxGetApp:MainLoop()" to not call wxApp::MainLoop(). + // The issue is that within the function wxApp::OnInit() wxApp::IsMainLoopRunning() + // returns false, but it will be running after OnInit() returns so we should + // silently ignore the Lua code wanting to prematurely start the MainLoop. + // Initialized to false, meaning not set. + // Set to true for the Lua code "wx.wxGetApp:MainLoop()" to not call + // the app's MainLoop() function. + // + // See the wxLua apps for usage. + static bool sm_wxAppMainLoop_will_run; + + // ----------------------------------------------------------------------- + // Get/Set the event handler that the wxLuaEvents from this will be sent to, can be NULL. // See wxEVT_LUA_XXX for a list of possible events that may be sent. |
|
From: Francesco M. <fr...@us...> - 2008-01-20 10:56:43
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28095/modules/build/msvc8 Added Files: modules_mod_luamodule_mono.vcproj Log Message: add to CVS the new project files generated by luamodule MONOLITHIC build addition --- NEW FILE: modules_mod_luamodule_mono.vcproj --- <?xml version="1.0" ?> <!-- This makefile was generated by Bakefile 0.2.3 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> <VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="mod_luamodule_mono" ProjectGUID="{E72421D9-A661-52CC-A3E0-340D019D5186}" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Release Unicode DLL Monolithic|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswu_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" BufferSecurityCheck="false" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswu_dll\mod_luamodule_mono\" ObjectFile="vcmswu_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28u_gl.lib wxmsw28u.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release Unicode DLL Multilib|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswu_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" BufferSecurityCheck="false" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswu_dll\mod_luamodule_mono\" ObjectFile="vcmswu_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release DLL Monolithic|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmsw_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" BufferSecurityCheck="false" RuntimeTypeInfo="true" AssemblerListingLocation="vcmsw_dll\mod_luamodule_mono\" ObjectFile="vcmsw_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28_gl.lib wxmsw28.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release DLL Multilib|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmsw_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="false" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" BasicRuntimeChecks="0" DebugInformationFormat="0" BufferSecurityCheck="false" RuntimeTypeInfo="true" AssemblerListingLocation="vcmsw_dll\mod_luamodule_mono\" ObjectFile="vcmsw_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Debug Unicode DLL Monolithic|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswud_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="3" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswud_dll\mod_luamodule_mono\" ObjectFile="vcmswud_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Debug Unicode DLL Multilib|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswud_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="3" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswud_dll\mod_luamodule_mono\" ObjectFile="vcmswud_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Debug DLL Monolithic|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswd_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="3" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswd_dll\mod_luamodule_mono\" ObjectFile="vcmswd_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28d_gl.lib wxmsw28d.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Debug DLL Multilib|Win32" OutputDirectory="..\..\..\lib\vc_dll" IntermediateDirectory="vcmswd_dll\mod_luamodule_mono" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" > <Tool Name="VCPreBuildEventTool" /> <Tool Name="VCCustomBuildTool" /> <Tool Name="VCXMLDataGeneratorTool" /> <Tool Name="VCWebServiceProxyGeneratorTool" /> <Tool Name="VCIDLTool" /> <Tool Name="VCCLCompilerTool" Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" MinimalRebuild="true" ExceptionHandling="1" AdditionalOptions="" RuntimeLibrary="3" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" RuntimeTypeInfo="true" AssemblerListingLocation="vcmswd_dll\mod_luamodule_mono\" ObjectFile="vcmswd_dll\mod_luamodule_mono\" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" WarningLevel="1" SuppressStartupBanner="true" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" /> <Tool Name="VCPreLinkEventTool" /> <Tool Name="VCLinkerTool" AdditionalDependencies="lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll;..\..\..\lib\vc_dll;..\..\..\modules\lua\lib" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" TargetMachine="1" /> <Tool Name="VCALinkTool" /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" OutputFile="..\..\..\lib\vc_dll\modules_mod_luamodule_mono.bsc" SuppressStartupBanner="true" /> <Tool Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" > <File RelativePath="..\..\wxbind\src\dummy.cpp" /> <File RelativePath="..\..\wxluadebug\src\dummy.cpp" /> <File RelativePath="..\..\wxluasocket\src\dummy.cpp" /> <File RelativePath="..\..\wxlua\src\dummy.cpp" /> <File RelativePath="..\..\luamodule\src\luamodule.cpp" /> <File RelativePath="..\..\wxbind\src\wxadv_adv.cpp" /> <File RelativePath="..\..\wxbind\src\wxadv_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxadv_grid.cpp" /> <File RelativePath="..\..\wxbind\src\wxaui_aui.cpp" /> <File RelativePath="..\..\wxbind\src\wxaui_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_base.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_config.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_data.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_datetime.cpp" /> <File RelativePath="..\..\wxbind\src\wxbase_file.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_appframe.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_clipdrag.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_controls.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_core.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_defsutils.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_dialogs.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_event.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_gdi.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_geometry.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_help.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_image.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_mdi.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_menutool.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_picker.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_print.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_sizer.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_windows.cpp" /> <File RelativePath="..\..\wxbind\src\wxcore_wxlcore.cpp" /> <File RelativePath="..\..\wxbind\src\wxgl_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxgl_gl.cpp" /> <File RelativePath="..\..\wxbind\src\wxhtml_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxhtml_html.cpp" /> <File RelativePath="..\..\wxbind\src\wxhtml_wxlhtml.cpp" /> <File RelativePath="..\..\wxlua\src\wxlbind.cpp" /> <File RelativePath="..\..\wxlua\src\wxlcallb.cpp" /> <File RelativePath="..\..\wxluadebug\src\wxldebug.cpp" /> <File RelativePath="..\..\wxluasocket\src\wxldserv.cpp" /> <File RelativePath="..\..\wxluasocket\src\wxldtarg.cpp" /> <File RelativePath="..\..\wxluasocket\src\wxlsock.cpp" /> <File RelativePath="..\..\wxluadebug\src\wxlstack.cpp" /> <File RelativePath="..\..\wxlua\src\wxlstate.cpp" /> <File RelativePath="..\..\wxlua\src\wxlua.cpp" /> <File RelativePath="..\..\wxlua\src\wxlua_bind.cpp" /> <File RelativePath="..\..\wxluasocket\src\wxluasocket.cpp" /> <File RelativePath="..\..\wxluasocket\src\wxluasocket_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxmedia_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxmedia_media.cpp" /> <File RelativePath="..\..\wxbind\src\wxnet_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxnet_net.cpp" /> <File RelativePath="..\..\wxbind\src\wxrichtext_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxrichtext_richtext.cpp" /> <File RelativePath="..\..\wxbind\src\wxstc_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxstc_stc.cpp" /> <File RelativePath="..\..\wxbind\src\wxxml_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxxml_xml.cpp" /> <File RelativePath="..\..\wxbind\src\wxxrc_bind.cpp" /> <File RelativePath="..\..\wxbind\src\wxxrc_xrc.cpp" /> </Filter> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Francesco M. <fr...@us...> - 2008-01-20 10:56:41
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28095/modules/build/msvc6 Added Files: modules_mod_luamodule_mono.dsp Log Message: add to CVS the new project files generated by luamodule MONOLITHIC build addition --- NEW FILE: modules_mod_luamodule_mono.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_luamodule_mono" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=mod_luamodule_mono - Win32 Debug DLL Multilib !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_luamodule_mono.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_luamodule_mono.mak" CFG="mod_luamodule_mono - Win32 Debug DLL Multilib" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_luamodule_mono - Win32 Release Unicode DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Release DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Release DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Debug DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_luamodule_mono - Win32 Debug DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28u_gl.lib wxmsw28u.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28u_gl.lib wxmsw28u.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28_gl.lib wxmsw28.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28_gl.lib wxmsw28.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d WXMAKINGDLL_LUAMODULE BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28d_gl.lib wxmsw28d.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28d_gl.lib wxmsw28d.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule_mono" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule_mono" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\wxbind\setup" /Zi /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "..\..\..\modules\wxbind\setup" /d "WXMAKINGDLL_LUAMODULE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" # ADD LINK32 lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug /pdb:"..\..\..\lib\vc_dll\wx.pdb" !ENDIF # Begin Target # Name "mod_luamodule_mono - Win32 Release Unicode DLL Monolithic" # Name "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" # Name "mod_luamodule_mono - Win32 Release DLL Monolithic" # Name "mod_luamodule_mono - Win32 Release DLL Multilib" # Name "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" # Name "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" # Name "mod_luamodule_mono - Win32 Debug DLL Monolithic" # Name "mod_luamodule_mono - Win32 Debug DLL Multilib" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxbind\src\dummy.cpp !IF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Monolithic" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release Unicode DLL Multilib" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Monolithic" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Release DLL Multilib" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Monolithic" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug Unicode DLL Multilib" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Monolithic" !ELSEIF "$(CFG)" == "mod_luamodule_mono - Win32 Debug DLL Multilib" !ENDIF # End Source File # Begin Source File SOURCE=..\..\wxluadebug\src\dummy.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\dummy.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\dummy.cpp # End Source File # Begin Source File SOURCE=..\..\luamodule\src\luamodule.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxadv_adv.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxadv_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxadv_grid.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxaui_aui.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxaui_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_base.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_config.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_data.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_datetime.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxbase_file.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_appframe.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_clipdrag.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_controls.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_core.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_defsutils.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_dialogs.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_event.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_gdi.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_geometry.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_help.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_image.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_mdi.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_menutool.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_picker.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_print.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_sizer.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_windows.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxcore_wxlcore.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxgl_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxgl_gl.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxhtml_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxhtml_html.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxhtml_wxlhtml.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlbind.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlcallb.cpp # End Source File # Begin Source File SOURCE=..\..\wxluadebug\src\wxldebug.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\wxldserv.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\wxldtarg.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\wxlsock.cpp # End Source File # Begin Source File SOURCE=..\..\wxluadebug\src\wxlstack.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlstate.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlua.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlua_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\wxluasocket.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\wxluasocket_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxmedia_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxmedia_media.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxnet_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxnet_net.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxrichtext_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxrichtext_richtext.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxstc_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxstc_stc.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxxml_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxxml_xml.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxxrc_bind.cpp # End Source File # Begin Source File SOURCE=..\..\wxbind\src\wxxrc_xrc.cpp # End Source File # End Group # End Target # End Project |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:44
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules Modified Files: Makefile.in Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Makefile.in 16 Jan 2008 19:54:25 -0000 1.68 --- Makefile.in 19 Jan 2008 21:37:10 -0000 1.69 *************** *** 570,573 **** --- 570,652 ---- MOD_LUAMODULE_OBJECTS = \ mod_luamodule_luamodule.o + MOD_LUAMODULE_MONO_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(LUA_INCLUDE_DIR) -I$(top_srcdir)/modules/wxbind/setup \ + -DWXMAKINGDLL_LUAMODULE $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + MOD_LUAMODULE_MONO_OBJECTS = \ + mod_luamodule_mono_luamodule.o \ + mod_luamodule_mono_wxadv_adv.o \ + mod_luamodule_mono_wxadv_bind.o \ + mod_luamodule_mono_wxadv_grid.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxaui_aui.o \ + mod_luamodule_mono_wxaui_bind.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxbase_base.o \ + mod_luamodule_mono_wxbase_bind.o \ + mod_luamodule_mono_wxbase_config.o \ + mod_luamodule_mono_wxbase_data.o \ + mod_luamodule_mono_wxbase_datetime.o \ + mod_luamodule_mono_wxbase_file.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxcore_appframe.o \ + mod_luamodule_mono_wxcore_bind.o \ + mod_luamodule_mono_wxcore_clipdrag.o \ + mod_luamodule_mono_wxcore_controls.o \ + mod_luamodule_mono_wxcore_core.o \ + mod_luamodule_mono_wxcore_defsutils.o \ + mod_luamodule_mono_wxcore_dialogs.o \ + mod_luamodule_mono_wxcore_event.o \ + mod_luamodule_mono_wxcore_gdi.o \ + mod_luamodule_mono_wxcore_geometry.o \ + mod_luamodule_mono_wxcore_help.o \ + mod_luamodule_mono_wxcore_image.o \ + mod_luamodule_mono_wxcore_mdi.o \ + mod_luamodule_mono_wxcore_menutool.o \ + mod_luamodule_mono_wxcore_picker.o \ + mod_luamodule_mono_wxcore_print.o \ + mod_luamodule_mono_wxcore_sizer.o \ + mod_luamodule_mono_wxcore_windows.o \ + mod_luamodule_mono_wxcore_wxlcore.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxgl_bind.o \ + mod_luamodule_mono_wxgl_gl.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxhtml_bind.o \ + mod_luamodule_mono_wxhtml_html.o \ + mod_luamodule_mono_wxhtml_wxlhtml.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxmedia_bind.o \ + mod_luamodule_mono_wxmedia_media.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxnet_bind.o \ + mod_luamodule_mono_wxnet_net.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxrichtext_bind.o \ + mod_luamodule_mono_wxrichtext_richtext.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxstc_bind.o \ + mod_luamodule_mono_wxstc_stc.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxxml_bind.o \ + mod_luamodule_mono_wxxml_xml.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxxrc_bind.o \ + mod_luamodule_mono_wxxrc_xrc.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxldserv.o \ + mod_luamodule_mono_wxldtarg.o \ + mod_luamodule_mono_wxlsock.o \ + mod_luamodule_mono_wxluasocket.o \ + mod_luamodule_mono_wxluasocket_bind.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxldebug.o \ + mod_luamodule_mono_wxlstack.o \ + mod_luamodule_mono_dummy.o \ + mod_luamodule_mono_wxlbind.o \ + mod_luamodule_mono_wxlcallb.o \ + mod_luamodule_mono_wxlstate.o \ + mod_luamodule_mono_wxlua.o \ + mod_luamodule_mono_wxlua_bind.o ### Conditionally set variables: ### *************** *** 1695,1705 **** @COND_SHARED_1_USE_WXLUASOCKET_1@__uninstall_wxluasocket_dll_headers___depname \ @COND_SHARED_1_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_dll_headers ! @COND_SHARED_1_USE_LUAMODULE_1@__mod_luamodule___depname \ ! @COND_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_SHARED_1_USE_LUAMODULE_1@ ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) ! @COND_SHARED_1_USE_LUAMODULE_1@__install_mod_luamodule___depname \ ! @COND_SHARED_1_USE_LUAMODULE_1@ = install_mod_luamodule ! @COND_SHARED_1_USE_LUAMODULE_1@__uninstall_mod_luamodule___depname \ ! @COND_SHARED_1_USE_LUAMODULE_1@ = uninstall_mod_luamodule @COND_INSTALL_CUSTOM_WXBIND_1@__wxbindsrc___depname = wxbindsrc @COND_INSTALL_CUSTOM_WXBIND_1@__wxbindmake___depname = wxbindmake --- 1774,1795 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@__uninstall_wxluasocket_dll_headers___depname \ @COND_SHARED_1_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_dll_headers ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@__mod_luamodule___depname \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@__install_mod_luamodule___depname \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ install_mod_luamodule ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@__uninstall_mod_luamodule___depname \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ uninstall_mod_luamodule ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@__mod_luamodule_mono___depname \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@__install_mod_luamodule_mono___depname \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ install_mod_luamodule_mono ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@__uninstall_mod_luamodule_mono___depname \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ = \ ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ uninstall_mod_luamodule_mono @COND_INSTALL_CUSTOM_WXBIND_1@__wxbindsrc___depname = wxbindsrc @COND_INSTALL_CUSTOM_WXBIND_1@__wxbindmake___depname = wxbindmake *************** *** 1719,1729 **** ### Targets: ### ! all: $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbindadv_lib___depname) $(__wxbindadv_dll___depname) $(__wxbindaui_lib___depname) $(__wxbindaui_dll___depname) $(__wxbindbase_lib___depname) $(__wxbindbase_dll___depname) $(__wxbindcore_lib___depname) $(__wxbindcore_dll___depname) $(__wxbindgl_lib___depname) $(__wxbindgl_dll___depname) $(__wxbindhtml_lib___depname) $(__wxbindhtml_dll___depname) $(__wxbindmedia_lib___depname) $(__wxbindmedia_dll___depname) $(__wxbindnet_lib___depname) $(__wxbindnet_dll___depname) $(__wxbindrichtext_lib___depname) $(__wxbindrichtext_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxbindxml_lib___depname) $(__wxbindxml_dll___depname) $(__wxbindxrc_lib___depname) $(__wxbindxrc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) ! install: all $(__install_lua_lib___depname) $(__install_lua_dll___depname) $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbindadv_lib___depname) $(__install_wxbindadv_lib_headers___depname) $(__install_wxbindadv_dll___depname) $(__install_wxbindadv_dll_headers___depname) $(__install_wxbindaui_lib___depname) $(__install_wxbindaui_lib_headers___depname) $(__install_wxbindaui_dll___depname) $(__install_wxbindaui_dll_headers___depname) $(__install_wxbindbase_lib___depname) $(__install_wxbindbase_lib_headers___depname) $(__install_wxbindbase_dll___depname) $(__install_wxbindbase_dll_headers___depname) $(__install_wxbindcore_lib___depname) $(__install_wxbindcore_lib_headers___depname) $(__install_wxbindcore_dll___depname) $(__install_wxbindcore_dll_headers___depname) $(__install_wxbindgl_lib___depname) $(__install_wxbindgl_lib_headers___depname) $(__install_wxbindgl_dll___depname) $(__install_wxbindgl_dll_headers___depname) $(__install_wxbindhtml_lib___depname) $(__install_wxbindhtml_lib_headers___depname) $(__install_wxbindhtml_dll___depname) $(__install_wxbindhtml_dll_headers___depname) $(__install_wxbindmedia_lib___depname) $(__install_wxbindmedia_lib_headers___depname) $(__install_wxbindmedia_dll___depname) $(__install_wxbindmedia_dll_headers___depname) $(__install_wxbindnet_lib___depname) $(__install_wxbindnet_lib_headers___depname) $(__install_wxbindnet_dll___depname) $(__install_wxbindnet_dll_headers___depname) $(__install_wxbindrichtext_lib___depname) $(__install_wxbindrichtext_lib_headers___depname) $(__install_wxbindrichtext_dll___depname) $(__install_wxbindrichtext_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxbindxml_lib___depname) $(__install_wxbindxml_lib_headers___depname) $(__install_wxbindxml_dll___depname) $(__install_wxbindxml_dll_headers___depname) $(__install_wxbindxrc_lib___depname) $(__install_wxbindxrc_lib_headers___depname) $(__install_wxbindxrc_dll___depname) $(__install_wxbindxrc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) $(__install_mod_luamodule___depname) $(__wxbindsrc___depname) $(__wxbindmake___depname) $(__wxbindsetup___depname) $(INSTALL_DIR) $(DESTDIR)$(includedir) (cd $(srcdir) ; $(INSTALL_DATA) lua/include/lauxlib.h lua/include/lua.h lua/include/luaconf.h lua/include/lualib.h $(DESTDIR)$(includedir)) ! uninstall: $(__uninstall_lua_lib___depname) $(__uninstall_lua_dll___depname) $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbindadv_lib___depname) $(__uninstall_wxbindadv_lib_headers___depname) $(__uninstall_wxbindadv_dll___depname) $(__uninstall_wxbindadv_dll_headers___depname) $(__uninstall_wxbindaui_lib___depname) $(__uninstall_wxbindaui_lib_headers___depname) $(__uninstall_wxbindaui_dll___depname) $(__uninstall_wxbindaui_dll_headers___depname) $(__uninstall_wxbindbase_lib___depname) $(__uninstall_wxbindbase_lib_headers___depname) $(__uninstall_wxbindbase_dll___depname) $(__uninstall_wxbindbase_dll_headers___depname) $(__uninstall_wxbindcore_lib___depname) $(__uninstall_wxbindcore_lib_headers___depname) $(__uninstall_wxbindcore_dll___depname) $(__uninstall_wxbindcore_dll_headers___depname) $(__uninstall_wxbindgl_lib___depname) $(__uninstall_wxbindgl_lib_headers___depname) $(__uninstall_wxbindgl_dll___depname) $(__uninstall_wxbindgl_dll_headers___depname) $(__uninstall_wxbindhtml_lib___depname) $(__uninstall_wxbindhtml_lib_headers___depname) $(__uninstall_wxbindhtml_dll___depname) $(__uninstall_wxbindhtml_dll_headers___depname) $(__uninstall_wxbindmedia_lib___depname) $(__uninstall_wxbindmedia_lib_headers___depname) $(__uninstall_wxbindmedia_dll___depname) $(__uninstall_wxbindmedia_dll_headers___depname) $(__uninstall_wxbindnet_lib___depname) $(__uninstall_wxbindnet_lib_headers___depname) $(__uninstall_wxbindnet_dll___depname) $(__uninstall_wxbindnet_dll_headers___depname) $(__uninstall_wxbindrichtext_lib___depname) $(__uninstall_wxbindrichtext_lib_headers___depname) $(__uninstall_wxbindrichtext_dll___depname) $(__uninstall_wxbindrichtext_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxbindxml_lib___depname) $(__uninstall_wxbindxml_lib_headers___depname) $(__uninstall_wxbindxml_dll___depname) $(__uninstall_wxbindxml_dll_headers___depname) $(__uninstall_wxbindxrc_lib___depname) $(__uninstall_wxbindxrc_lib_headers___depname) $(__uninstall_wxbindxrc_dll___depname) $(__uninstall_wxbindxrc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) $(__uninstall_mod_luamodule___depname) (cd $(DESTDIR)$(includedir) ; rm -f lauxlib.h lua.h luaconf.h lualib.h) --- 1809,1819 ---- ### Targets: ### ! all: $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbindadv_lib___depname) $(__wxbindadv_dll___depname) $(__wxbindaui_lib___depname) $(__wxbindaui_dll___depname) $(__wxbindbase_lib___depname) $(__wxbindbase_dll___depname) $(__wxbindcore_lib___depname) $(__wxbindcore_dll___depname) $(__wxbindgl_lib___depname) $(__wxbindgl_dll___depname) $(__wxbindhtml_lib___depname) $(__wxbindhtml_dll___depname) $(__wxbindmedia_lib___depname) $(__wxbindmedia_dll___depname) $(__wxbindnet_lib___depname) $(__wxbindnet_dll___depname) $(__wxbindrichtext_lib___depname) $(__wxbindrichtext_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxbindxml_lib___depname) $(__wxbindxml_dll___depname) $(__wxbindxrc_lib___depname) $(__wxbindxrc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) $(__mod_luamodule_mono___depname) ! install: all $(__install_lua_lib___depname) $(__install_lua_dll___depname) $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbindadv_lib___depname) $(__install_wxbindadv_lib_headers___depname) $(__install_wxbindadv_dll___depname) $(__install_wxbindadv_dll_headers___depname) $(__install_wxbindaui_lib___depname) $(__install_wxbindaui_lib_headers___depname) $(__install_wxbindaui_dll___depname) $(__install_wxbindaui_dll_headers___depname) $(__install_wxbindbase_lib___depname) $(__install_wxbindbase_lib_headers___depname) $(__install_wxbindbase_dll___depname) $(__install_wxbindbase_dll_headers___depname) $(__install_wxbindcore_lib___depname) $(__install_wxbindcore_lib_headers___depname) $(__install_wxbindcore_dll___depname) $(__install_wxbindcore_dll_headers___depname) $(__install_wxbindgl_lib___depname) $(__install_wxbindgl_lib_headers___depname) $(__install_wxbindgl_dll___depname) $(__install_wxbindgl_dll_headers___depname) $(__install_wxbindhtml_lib___depname) $(__install_wxbindhtml_lib_headers___depname) $(__install_wxbindhtml_dll___depname) $(__install_wxbindhtml_dll_headers___depname) $(__install_wxbindmedia_lib___depname) $(__install_wxbindmedia_lib_headers___depname) $(__install_wxbindmedia_dll___depname) $(__install_wxbindmedia_dll_headers___depname) $(__install_wxbindnet_lib___depname) $(__install_wxbindnet_lib_headers___depname) $(__install_wxbindnet_dll___depname) $(__install_wxbindnet_dll_headers___depname) $(__install_wxbindrichtext_lib___depname) $(__install_wxbindrichtext_lib_headers___depname) $(__install_wxbindrichtext_dll___depname) $(__install_wxbindrichtext_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxbindxml_lib___depname) $(__install_wxbindxml_lib_headers___depname) $(__install_wxbindxml_dll___depname) $(__install_wxbindxml_dll_headers___depname) $(__install_wxbindxrc_lib___depname) $(__install_wxbindxrc_lib_headers___depname) $(__install_wxbindxrc_dll___depname) $(__install_wxbindxrc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) $(__install_mod_luamodule___depname) $(__install_mod_luamodule_mono___depname) $(__wxbindsrc___depname) $(__wxbindmake___depname) $(__wxbindsetup___depname) $(INSTALL_DIR) $(DESTDIR)$(includedir) (cd $(srcdir) ; $(INSTALL_DATA) lua/include/lauxlib.h lua/include/lua.h lua/include/luaconf.h lua/include/lualib.h $(DESTDIR)$(includedir)) ! uninstall: $(__uninstall_lua_lib___depname) $(__uninstall_lua_dll___depname) $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbindadv_lib___depname) $(__uninstall_wxbindadv_lib_headers___depname) $(__uninstall_wxbindadv_dll___depname) $(__uninstall_wxbindadv_dll_headers___depname) $(__uninstall_wxbindaui_lib___depname) $(__uninstall_wxbindaui_lib_headers___depname) $(__uninstall_wxbindaui_dll___depname) $(__uninstall_wxbindaui_dll_headers___depname) $(__uninstall_wxbindbase_lib___depname) $(__uninstall_wxbindbase_lib_headers___depname) $(__uninstall_wxbindbase_dll___depname) $(__uninstall_wxbindbase_dll_headers___depname) $(__uninstall_wxbindcore_lib___depname) $(__uninstall_wxbindcore_lib_headers___depname) $(__uninstall_wxbindcore_dll___depname) $(__uninstall_wxbindcore_dll_headers___depname) $(__uninstall_wxbindgl_lib___depname) $(__uninstall_wxbindgl_lib_headers___depname) $(__uninstall_wxbindgl_dll___depname) $(__uninstall_wxbindgl_dll_headers___depname) $(__uninstall_wxbindhtml_lib___depname) $(__uninstall_wxbindhtml_lib_headers___depname) $(__uninstall_wxbindhtml_dll___depname) $(__uninstall_wxbindhtml_dll_headers___depname) $(__uninstall_wxbindmedia_lib___depname) $(__uninstall_wxbindmedia_lib_headers___depname) $(__uninstall_wxbindmedia_dll___depname) $(__uninstall_wxbindmedia_dll_headers___depname) $(__uninstall_wxbindnet_lib___depname) $(__uninstall_wxbindnet_lib_headers___depname) $(__uninstall_wxbindnet_dll___depname) $(__uninstall_wxbindnet_dll_headers___depname) $(__uninstall_wxbindrichtext_lib___depname) $(__uninstall_wxbindrichtext_lib_headers___depname) $(__uninstall_wxbindrichtext_dll___depname) $(__uninstall_wxbindrichtext_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxbindxml_lib___depname) $(__uninstall_wxbindxml_lib_headers___depname) $(__uninstall_wxbindxml_dll___depname) $(__uninstall_wxbindxml_dll_headers___depname) $(__uninstall_wxbindxrc_lib___depname) $(__uninstall_wxbindxrc_lib_headers___depname) $(__uninstall_wxbindxrc_dll___depname) $(__uninstall_wxbindxrc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) $(__uninstall_mod_luamodule___depname) $(__uninstall_mod_luamodule_mono___depname) (cd $(DESTDIR)$(includedir) ; rm -f lauxlib.h lua.h luaconf.h lualib.h) *************** *** 1746,1749 **** --- 1836,1840 ---- $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__wx) $(STRIP) $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) + $(STRIP) $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) clean: *************** *** 1815,1818 **** --- 1906,1910 ---- rm -f ../lib/$(LIBPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ../lib/$(DLLPREFIX)wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) + rm -f ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) distclean: clean *************** *** 2777,2789 **** @COND_SHARED_1_USE_WXLUASOCKET_1@ done ! @COND_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) ! @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: ! @COND_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)/lua/5.1 ! @COND_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) $(DESTDIR)$(libdir)/lua/5.1 ! @COND_SHARED_1_USE_LUAMODULE_1@uninstall_mod_luamodule: ! @COND_SHARED_1_USE_LUAMODULE_1@ rm -f $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: --- 2869,2891 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@ done ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)/lua/5.1 ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) $(DESTDIR)$(libdir)/lua/5.1 ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@uninstall_mod_luamodule: ! @COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1@ rm -f $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) ! ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_MONO_OBJECTS) ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_MONO_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) ! ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule_mono: ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)/lua/5.1 ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ $(INSTALL_PROGRAM) ../lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) $(DESTDIR)$(libdir)/lua/5.1 ! ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@uninstall_mod_luamodule_mono: ! @COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1@ rm -f $(DESTDIR)$(libdir)/lua/5.1/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: *************** *** 3444,3450 **** $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_dll uninstall_lua_dll install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbindadv_lib uninstall_wxbindadv_lib install_wxbindadv_lib_headers uninstall_wxbindadv_lib_headers install_wxbindadv_dll uninstall_wxbindadv_dll install_wxbindadv_dll_headers uninstall_wxbindadv_dll_headers install_wxbindaui_lib uninstall_wxbindaui_lib install_wxbindaui_lib_headers uninstall_wxbindaui_lib_headers install_wxbindaui_dll uninstall_wxbindaui_dll install_wxbindaui_dll_headers uninstall_wxbindaui_dll_headers install_wxbindbase_lib uninstall_wxbindbase_lib install_wxbindbase_lib_headers uninstall_wxbindbase_lib_headers install_wxbindbase_dll uninstall_wxbindbase_dll install_wxbindbase_dll_headers uninstall_wxbindbase_dll_headers install_wxbindcore_lib uninstall_wxbindcore_lib install_wxbindcore_lib_headers uninstall_wxbindcore_lib_headers install_wxbindcore_dll uninstall_wxbindcore_dll install_wxbindcore_dll_headers uninstall_wxbindcore_dll_headers install_wxbindgl_lib uninstall_wxbindgl_lib install_wxbindgl_lib_headers uninstall_wxbindgl_lib_headers install_wxbindgl_dll uninstall_wxbindgl_dll install_wxbindgl_dll_headers uninstall_wxbindgl_dll_headers install_wxbindhtml_lib uninstall_wxbindhtml_lib install_wxbindhtml_lib_headers uninstall_wxbindhtml_lib_headers install_wxbindhtml_dll uninstall_wxbindhtml_dll install_wxbindhtml_dll_headers uninstall_wxbindhtml_dll_headers install_wxbindmedia_lib uninstall_wxbindmedia_lib install_wxbindmedia_lib_headers uninstall_wxbindmedia_lib_headers install_wxbindmedia_dll uninstall_wxbindmedia_dll install_wxbindmedia_dll_headers uninstall_wxbindmedia_dll_headers install_wxbindnet_lib uninstall_wxbindnet_lib install_wxbindnet_lib_headers uninstall_wxbindnet_lib_headers install_wxbindnet_dll uninstall_wxbindnet_dll install_wxbindnet_dll_headers uninstall_wxbindnet_dll_headers install_wxbindrichtext_lib uninstall_wxbindrichtext_lib install_wxbindrichtext_lib_headers uninstall_wxbindrichtext_lib_headers install_wxbindrichtext_dll uninstall_wxbindrichtext_dll install_wxbindrichtext_dll_headers uninstall_wxbindrichtext_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxbindxml_lib uninstall_wxbindxml_lib install_wxbindxml_lib_headers uninstall_wxbindxml_lib_headers install_wxbindxml_dll uninstall_wxbindxml_dll install_wxbindxml_dll_headers uninstall_wxbindxml_dll_headers install_wxbindxrc_lib uninstall_wxbindxrc_lib install_wxbindxrc_lib_headers uninstall_wxbindxrc_lib_headers install_wxbindxrc_dll uninstall_wxbindxrc_dll install_wxbindxrc_dll_headers uninstall_wxbindxrc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup --- 3546,3777 ---- $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp + mod_luamodule_mono_luamodule.o: $(srcdir)/luamodule/src/luamodule.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp + + mod_luamodule_mono_wxadv_adv.o: $(srcdir)/wxbind/src/wxadv_adv.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_adv.cpp + + mod_luamodule_mono_wxadv_bind.o: $(srcdir)/wxbind/src/wxadv_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_bind.cpp + + mod_luamodule_mono_wxadv_grid.o: $(srcdir)/wxbind/src/wxadv_grid.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxadv_grid.cpp + + mod_luamodule_mono_wxaui_aui.o: $(srcdir)/wxbind/src/wxaui_aui.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxaui_aui.cpp + + mod_luamodule_mono_wxaui_bind.o: $(srcdir)/wxbind/src/wxaui_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxaui_bind.cpp + + mod_luamodule_mono_wxbase_base.o: $(srcdir)/wxbind/src/wxbase_base.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_base.cpp + + mod_luamodule_mono_wxbase_bind.o: $(srcdir)/wxbind/src/wxbase_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_bind.cpp + + mod_luamodule_mono_wxbase_config.o: $(srcdir)/wxbind/src/wxbase_config.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_config.cpp + + mod_luamodule_mono_wxbase_data.o: $(srcdir)/wxbind/src/wxbase_data.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_data.cpp + + mod_luamodule_mono_wxbase_datetime.o: $(srcdir)/wxbind/src/wxbase_datetime.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_datetime.cpp + + mod_luamodule_mono_wxbase_file.o: $(srcdir)/wxbind/src/wxbase_file.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxbase_file.cpp + + mod_luamodule_mono_wxcore_appframe.o: $(srcdir)/wxbind/src/wxcore_appframe.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_appframe.cpp + + mod_luamodule_mono_wxcore_bind.o: $(srcdir)/wxbind/src/wxcore_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_bind.cpp + + mod_luamodule_mono_wxcore_clipdrag.o: $(srcdir)/wxbind/src/wxcore_clipdrag.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_clipdrag.cpp + + mod_luamodule_mono_wxcore_controls.o: $(srcdir)/wxbind/src/wxcore_controls.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_controls.cpp + + mod_luamodule_mono_wxcore_core.o: $(srcdir)/wxbind/src/wxcore_core.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_core.cpp + + mod_luamodule_mono_wxcore_defsutils.o: $(srcdir)/wxbind/src/wxcore_defsutils.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_defsutils.cpp + + mod_luamodule_mono_wxcore_dialogs.o: $(srcdir)/wxbind/src/wxcore_dialogs.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_dialogs.cpp + + mod_luamodule_mono_wxcore_event.o: $(srcdir)/wxbind/src/wxcore_event.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_event.cpp + + mod_luamodule_mono_wxcore_gdi.o: $(srcdir)/wxbind/src/wxcore_gdi.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_gdi.cpp + + mod_luamodule_mono_wxcore_geometry.o: $(srcdir)/wxbind/src/wxcore_geometry.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_geometry.cpp + + mod_luamodule_mono_wxcore_help.o: $(srcdir)/wxbind/src/wxcore_help.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_help.cpp + + mod_luamodule_mono_wxcore_image.o: $(srcdir)/wxbind/src/wxcore_image.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_image.cpp + + mod_luamodule_mono_wxcore_mdi.o: $(srcdir)/wxbind/src/wxcore_mdi.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_mdi.cpp + + mod_luamodule_mono_wxcore_menutool.o: $(srcdir)/wxbind/src/wxcore_menutool.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_menutool.cpp + + mod_luamodule_mono_wxcore_picker.o: $(srcdir)/wxbind/src/wxcore_picker.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_picker.cpp + + mod_luamodule_mono_wxcore_print.o: $(srcdir)/wxbind/src/wxcore_print.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_print.cpp + + mod_luamodule_mono_wxcore_sizer.o: $(srcdir)/wxbind/src/wxcore_sizer.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_sizer.cpp + + mod_luamodule_mono_wxcore_windows.o: $(srcdir)/wxbind/src/wxcore_windows.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp + + mod_luamodule_mono_wxcore_wxlcore.o: $(srcdir)/wxbind/src/wxcore_wxlcore.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlcore.cpp + + mod_luamodule_mono_wxgl_bind.o: $(srcdir)/wxbind/src/wxgl_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxgl_bind.cpp + + mod_luamodule_mono_wxgl_gl.o: $(srcdir)/wxbind/src/wxgl_gl.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxgl_gl.cpp + + mod_luamodule_mono_wxhtml_bind.o: $(srcdir)/wxbind/src/wxhtml_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_bind.cpp + + mod_luamodule_mono_wxhtml_html.o: $(srcdir)/wxbind/src/wxhtml_html.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp + + mod_luamodule_mono_wxhtml_wxlhtml.o: $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp + + mod_luamodule_mono_wxmedia_bind.o: $(srcdir)/wxbind/src/wxmedia_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxmedia_bind.cpp + + mod_luamodule_mono_wxmedia_media.o: $(srcdir)/wxbind/src/wxmedia_media.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxmedia_media.cpp + + mod_luamodule_mono_wxnet_bind.o: $(srcdir)/wxbind/src/wxnet_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxnet_bind.cpp + + mod_luamodule_mono_wxnet_net.o: $(srcdir)/wxbind/src/wxnet_net.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxnet_net.cpp + + mod_luamodule_mono_wxrichtext_bind.o: $(srcdir)/wxbind/src/wxrichtext_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxrichtext_bind.cpp + + mod_luamodule_mono_wxrichtext_richtext.o: $(srcdir)/wxbind/src/wxrichtext_richtext.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxrichtext_richtext.cpp + + mod_luamodule_mono_wxstc_bind.o: $(srcdir)/wxbind/src/wxstc_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxstc_bind.cpp + + mod_luamodule_mono_wxstc_stc.o: $(srcdir)/wxbind/src/wxstc_stc.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxstc_stc.cpp + + mod_luamodule_mono_wxxml_bind.o: $(srcdir)/wxbind/src/wxxml_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxxml_bind.cpp + + mod_luamodule_mono_wxxml_xml.o: $(srcdir)/wxbind/src/wxxml_xml.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxxml_xml.cpp + + mod_luamodule_mono_wxxrc_bind.o: $(srcdir)/wxbind/src/wxxrc_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxxrc_bind.cpp + + mod_luamodule_mono_wxxrc_xrc.o: $(srcdir)/wxbind/src/wxxrc_xrc.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/wxxrc_xrc.cpp + + mod_luamodule_mono_wxldserv.o: $(srcdir)/wxluasocket/src/wxldserv.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldserv.cpp + + mod_luamodule_mono_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp + + mod_luamodule_mono_wxlsock.o: $(srcdir)/wxluasocket/src/wxlsock.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp + + mod_luamodule_mono_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp + + mod_luamodule_mono_wxluasocket_bind.o: $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp + + mod_luamodule_mono_wxldebug.o: $(srcdir)/wxluadebug/src/wxldebug.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluadebug/src/wxldebug.cpp + + mod_luamodule_mono_wxlstack.o: $(srcdir)/wxluadebug/src/wxlstack.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluadebug/src/wxlstack.cpp + + mod_luamodule_mono_wxlbind.o: $(srcdir)/wxlua/src/wxlbind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlbind.cpp + + mod_luamodule_mono_wxlcallb.o: $(srcdir)/wxlua/src/wxlcallb.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlcallb.cpp + + mod_luamodule_mono_wxlstate.o: $(srcdir)/wxlua/src/wxlstate.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlstate.cpp + + mod_luamodule_mono_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp + + mod_luamodule_mono_wxlua_bind.o: $(srcdir)/wxlua/src/wxlua_bind.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/wxlua_bind.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxbind/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxbind/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxluasocket/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluasocket/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxluadebug/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxluadebug/src/dummy.cpp + + mod_luamodule_mono_dummy.o: $(srcdir)/wxlua/src/dummy.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(srcdir)/wxlua/src/dummy.cpp + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_dll uninstall_lua_dll install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbindadv_lib uninstall_wxbindadv_lib install_wxbindadv_lib_headers uninstall_wxbindadv_lib_headers install_wxbindadv_dll uninstall_wxbindadv_dll install_wxbindadv_dll_headers uninstall_wxbindadv_dll_headers install_wxbindaui_lib uninstall_wxbindaui_lib install_wxbindaui_lib_headers uninstall_wxbindaui_lib_headers install_wxbindaui_dll uninstall_wxbindaui_dll install_wxbindaui_dll_headers uninstall_wxbindaui_dll_headers install_wxbindbase_lib uninstall_wxbindbase_lib install_wxbindbase_lib_headers uninstall_wxbindbase_lib_headers install_wxbindbase_dll uninstall_wxbindbase_dll install_wxbindbase_dll_headers uninstall_wxbindbase_dll_headers install_wxbindcore_lib uninstall_wxbindcore_lib install_wxbindcore_lib_headers uninstall_wxbindcore_lib_headers install_wxbindcore_dll uninstall_wxbindcore_dll install_wxbindcore_dll_headers uninstall_wxbindcore_dll_headers install_wxbindgl_lib uninstall_wxbindgl_lib install_wxbindgl_lib_headers uninstall_wxbindgl_lib_headers install_wxbindgl_dll uninstall_wxbindgl_dll install_wxbindgl_dll_headers uninstall_wxbindgl_dll_headers install_wxbindhtml_lib uninstall_wxbindhtml_lib install_wxbindhtml_lib_headers uninstall_wxbindhtml_lib_headers install_wxbindhtml_dll uninstall_wxbindhtml_dll install_wxbindhtml_dll_headers uninstall_wxbindhtml_dll_headers install_wxbindmedia_lib uninstall_wxbindmedia_lib install_wxbindmedia_lib_headers uninstall_wxbindmedia_lib_headers install_wxbindmedia_dll uninstall_wxbindmedia_dll install_wxbindmedia_dll_headers uninstall_wxbindmedia_dll_headers install_wxbindnet_lib uninstall_wxbindnet_lib install_wxbindnet_lib_headers uninstall_wxbindnet_lib_headers install_wxbindnet_dll uninstall_wxbindnet_dll install_wxbindnet_dll_headers uninstall_wxbindnet_dll_headers install_wxbindrichtext_lib uninstall_wxbindrichtext_lib install_wxbindrichtext_lib_headers uninstall_wxbindrichtext_lib_headers install_wxbindrichtext_dll uninstall_wxbindrichtext_dll install_wxbindrichtext_dll_headers uninstall_wxbindrichtext_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxbindxml_lib uninstall_wxbindxml_lib install_wxbindxml_lib_headers uninstall_wxbindxml_lib_headers install_wxbindxml_dll uninstall_wxbindxml_dll install_wxbindxml_dll_headers uninstall_wxbindxml_dll_headers install_wxbindxrc_lib uninstall_wxbindxrc_lib install_wxbindxrc_lib_headers uninstall_wxbindxrc_lib_headers install_wxbindxrc_dll uninstall_wxbindxrc_dll install_wxbindxrc_dll_headers uninstall_wxbindxrc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule install_mod_luamodule_mono uninstall_mod_luamodule_mono wxbindsrc wxbindmake wxbindsetup |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:44
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/build/msvc8 Modified Files: modules.sln Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: modules.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules.sln,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules.sln 15 Jan 2008 00:08:22 -0000 1.5 --- modules.sln 19 Jan 2008 21:37:10 -0000 1.6 *************** *** 33,37 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluasocket", "modules_mod_wxluasocket.vcproj", "{F7ADA638-7CD4-5139-9775-42DD313AFC82}" EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_luamodule", "modules_mod_luamodule.vcproj", "{4873368A-3282-5679-95B5-A15A2A1F4EC9}" EndProject Global --- 33,37 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluasocket", "modules_mod_wxluasocket.vcproj", "{F7ADA638-7CD4-5139-9775-42DD313AFC82}" EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_luamodule_mono", "modules_mod_luamodule_mono.vcproj", "{E72421D9-A661-52CC-A3E0-340D019D5186}" EndProject Global *************** *** 567,594 **** {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution --- 567,594 ---- {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:44
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** options.bkl 16 Jul 2007 19:34:32 -0000 1.15 --- options.bkl 19 Jan 2008 21:37:10 -0000 1.16 *************** *** 36,39 **** --- 36,40 ---- <set var="USE_WXLUASOCKET_DEFAULT">1</set> <set var="USE_LUAMODULE_DEFAULT">1</set> + <set var="MONOLITHIC_LUAMODULE_DEFAULT">0</set> *************** *** 137,140 **** --- 138,147 ---- </option> + <option name="MONOLITHIC_LUAMODULE"> + <values>0,1</values> + <default-value>$(MONOLITHIC_LUAMODULE_DEFAULT)</default-value> + <description>Build a monolithic Lua module ?</description> + </option> + <if cond="TARGETING_UNIX=='1'"> <option name="INSTALL_CUSTOM_WXBIND"> *************** *** 167,170 **** --- 174,178 ---- <set var="USE_WXLUASOCKET">1</set> <set var="USE_LUAMODULE">1</set> + <set var="MONOLITHIC_LUAMODULE">1</set> <set var="INSTALL_CUSTOM_WXBIND">0</set> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** modules.bkl 15 Jan 2008 00:03:02 -0000 1.50 --- modules.bkl 19 Jan 2008 21:37:10 -0000 1.51 *************** *** 299,303 **** <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> ! <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> --- 299,303 ---- <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> ! <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1' and MONOLITHIC_LUAMODULE=='0'"> <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> *************** *** 305,310 **** <install-to>$(LIBDIR)/lua/5.1</install-to> - <sources>$(LUAMODULE_SRC)</sources> <headers>$(LUAMODULE_HDR)</headers> <define>WXMAKINGDLL_LUAMODULE</define> --- 305,310 ---- <install-to>$(LIBDIR)/lua/5.1</install-to> <headers>$(LUAMODULE_HDR)</headers> + <sources>$(LUAMODULE_SRC)</sources> <define>WXMAKINGDLL_LUAMODULE</define> *************** *** 336,339 **** --- 336,381 ---- </module> + <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> + <module id="mod_luamodule_mono" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1' and MONOLITHIC_LUAMODULE=='1'"> + <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> + + <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> + <install-to>$(LIBDIR)/lua/5.1</install-to> + + <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> + + <headers>$(LUAMODULE_HDR)</headers> + <define>WXMAKINGDLL_LUAMODULE</define> + + <sources> + $(LUAMODULE_SRC) + $(WXBINDADV_SRC) + $(WXBINDAUI_SRC) + $(WXBINDBASE_SRC) + $(WXBINDCORE_SRC) + $(WXBINDGL_SRC) + $(WXBINDHTML_SRC) + $(WXBINDMEDIA_SRC) + $(WXBINDNET_SRC) + $(WXBINDRICHTEXT_SRC) + $(WXBINDSTC_SRC) + $(WXBINDXML_SRC) + $(WXBINDXRC_SRC) + $(WXLUASOCKET_SRC) + $(WXLUADEBUG_SRC) + $(WXLUA_SRC) + </sources> + + <!-- It's important to keep the module name 'wx' to make require("wx") work --> + <dllname>wx</dllname> + + <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim + version of lua, while we need the verbatim one (lua5.1.so/.dll) --> + + <wxlua-lib>lua</wxlua-lib> + + <wx-alllibs-req-bywxlua/> + </module> + <!-- since all the previous targets would generate each one a different DSP project |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:44
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/build/msvc6 Modified Files: modules.dsw Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: modules.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules.dsw 15 Jan 2008 00:08:20 -0000 1.4 --- modules.dsw 19 Jan 2008 21:37:10 -0000 1.5 *************** *** 195,199 **** ############################################################################### ! Project: "mod_luamodule"=modules_mod_luamodule.dsp - Package Owner=<4> Package=<5> --- 195,199 ---- ############################################################################### ! Project: "mod_luamodule_mono"=modules_mod_luamodule_mono.dsp - Package Owner=<4> Package=<5> |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:43
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/build/bakefiles Modified Files: options.bkl wxlua.bkl Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** options.bkl 18 Jan 2008 03:42:59 -0000 1.12 --- options.bkl 19 Jan 2008 21:37:09 -0000 1.13 *************** *** 159,165 **** </if> - <!-- FIXME this var is stripped with forcing it --> - <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> - <if cond="TARGETING_IDE=='1'"> --- 159,162 ---- Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxlua.bkl 16 Jan 2008 19:54:25 -0000 1.41 --- wxlua.bkl 19 Jan 2008 21:37:09 -0000 1.42 *************** *** 30,34 **** <!-- global options --> ! USE_SYSTEM_LUA LUA_INCLUDE_DIR LUA_LIB_DIR RUNTIME_LIBS <!-- wxWidgets build selection options --> --- 30,34 ---- <!-- global options --> ! USE_SYSTEM_LUA LUA_INCLUDE_DIR LUA_LIB_DIR RUNTIME_LIBS THREADING <!-- wxWidgets build selection options --> *************** *** 41,45 **** USE_WXBINDADV USE_WXBINDAUI USE_WXBINDBASE USE_WXBINDCORE USE_WXBINDGL USE_WXBINDHTML USE_WXBINDMEDIA USE_WXBINDNET USE_WXBINDRICHTEXT USE_WXBINDSTC USE_WXBINDXML USE_WXBINDXRC ! USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE INSTALL_CUSTOM_WXBIND </set> </if> --- 41,45 ---- USE_WXBINDADV USE_WXBINDAUI USE_WXBINDBASE USE_WXBINDCORE USE_WXBINDGL USE_WXBINDHTML USE_WXBINDMEDIA USE_WXBINDNET USE_WXBINDRICHTEXT USE_WXBINDSTC USE_WXBINDXML USE_WXBINDXRC ! USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE MONOLITHIC_LUAMODULE INSTALL_CUSTOM_WXBIND </set> </if> |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:43
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** makefile.vc 18 Jan 2008 03:43:00 -0000 1.52 --- makefile.vc 19 Jan 2008 21:37:09 -0000 1.53 *************** *** 124,127 **** --- 124,130 ---- USE_LUAMODULE = 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE = 0 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 163,166 **** --- 166,170 ---- USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ + MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \ USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.bcc 15 Jan 2008 18:37:27 -0000 1.45 --- makefile.bcc 19 Jan 2008 21:37:09 -0000 1.46 *************** *** 195,198 **** --- 195,203 ---- !endif + # Build a monolithic Lua module ? [0,1] + !ifndef MONOLITHIC_LUAMODULE + MONOLITHIC_LUAMODULE = 0 + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 244,247 **** --- 249,253 ---- -DUSE_WXBINDXRC="$(USE_WXBINDXRC)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ + -DMONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ -DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.wat 18 Jan 2008 03:43:00 -0000 1.51 --- makefile.wat 19 Jan 2008 21:37:09 -0000 1.52 *************** *** 124,127 **** --- 124,130 ---- USE_LUAMODULE = 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE = 0 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 215,218 **** --- 218,222 ---- USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & + MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" & USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.gcc 18 Jan 2008 03:42:59 -0000 1.49 --- makefile.gcc 19 Jan 2008 21:37:09 -0000 1.50 *************** *** 118,121 **** --- 118,124 ---- USE_LUAMODULE := 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE := 0 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP := 1 *************** *** 158,161 **** --- 161,165 ---- USE_WXBINDXRC="$(USE_WXBINDXRC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ + MONOLITHIC_LUAMODULE="$(MONOLITHIC_LUAMODULE)" \ USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:43
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** autoconf_inc.m4 17 Jan 2008 00:37:37 -0000 1.31 --- autoconf_inc.m4 19 Jan 2008 21:37:09 -0000 1.32 *************** *** 69,72 **** --- 69,84 ---- fi AC_SUBST(COND_INSTALL_CUSTOM_WXBIND_1) + dnl ### begin block 20_COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x0" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1) + dnl ### begin block 20_COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x1" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1) dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" *************** *** 207,216 **** fi AC_SUBST(COND_SHARED_1) - dnl ### begin block 20_COND_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### - COND_SHARED_1_USE_LUAMODULE_1="#" - if test "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then - COND_SHARED_1_USE_LUAMODULE_1="" - fi - AC_SUBST(COND_SHARED_1_USE_LUAMODULE_1) dnl ### begin block 20_COND_SHARED_1_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_SYSTEM_LUA_0="#" --- 219,222 ---- Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** aclocal.m4 15 Jan 2008 20:19:55 -0000 1.57 --- aclocal.m4 19 Jan 2008 21:37:08 -0000 1.58 *************** *** 1,6 **** ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** configure.ac 15 Jan 2008 20:19:55 -0000 1.66 --- configure.ac 19 Jan 2008 21:37:09 -0000 1.67 *************** *** 85,88 **** --- 85,91 ---- [AC_HELP_STRING([--enable-luamodule], [Compiles the lua module (default is yes)])], [], [enable_luamodule=yes]) + AC_ARG_ENABLE([monolithic_luamodule], + [AC_HELP_STRING([--enable-monolithic-luamodule], [Compile a monolithic lua module (default is no)])], + [], [enable_monolithic_luamodule=no]) AC_ARG_ENABLE([customwxbind-install], [AC_HELP_STRING([--enable-customwxbind-install], [Installs wxBind sources for custom builds (default is yes)])], *************** *** 118,124 **** UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) ! UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) ! UTILS_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) --- 121,128 ---- UTILS_YESNOAUTO_OPTCHECK([USE_WXBINDXRC], [enable_wxbindxrc], [--enable-wxbindxrc]) ! UTILS_YESNO_OPTCHECK([USE_WXLUADEBUG], [enable_wxluadebug], [--enable-wxluadebug]) ! UTILS_YESNO_OPTCHECK([USE_WXLUASOCKET], [enable_wxluasocket], [--enable-wxluasocket]) ! UTILS_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule], [--enable-luamodule]) ! UTILS_YESNO_OPTCHECK([MONOLITHIC_LUAMODULE], [enable_monolithic_luamodule], [--enable-monolithic-luamodule]) UTILS_YESNO_OPTCHECK([INSTALL_CUSTOM_WXBIND], [enable_customwxbind_install], [--enable-customwxbind-install]) *************** *** 821,832 **** UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) # miscellaneous --- 825,839 ---- UTILS_BOOLOPT_SUMMARY([USE_WXLUADEBUG], ! [" - enable_wxluadebug module: yes"], ! [" - enable_wxluadebug module: no"]) UTILS_BOOLOPT_SUMMARY([USE_WXLUASOCKET], ! [" - enable_wxluasocket module: yes"], ! [" - enable_wxluasocket module: no"]) UTILS_BOOLOPT_SUMMARY([USE_LUAMODULE], ! [" - enable_luamodule module: yes"], ! [" - enable_luamodule module: no"]) ! UTILS_BOOLOPT_SUMMARY([MONOLITHIC_LUAMODULE], ! [" - enable_monolithic_luamodule module: yes"], ! [" - enable_monolithic_luamodule module: no"]) # miscellaneous |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:42
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua Modified Files: configure Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** configure 15 Jan 2008 20:19:55 -0000 1.77 --- configure 19 Jan 2008 21:37:07 -0000 1.78 *************** *** 765,768 **** --- 765,770 ---- COND_ICC_PCH_1 COND_INSTALL_CUSTOM_WXBIND_1 + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1 + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 *************** *** 788,792 **** COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 - COND_SHARED_1_USE_LUAMODULE_1 COND_SHARED_1_USE_SYSTEM_LUA_0 COND_SHARED_1_USE_WXBINDADV_1 --- 790,793 ---- *************** *** 1442,1445 **** --- 1443,1448 ---- --enable-wxluasocket Compiles the wxLua socket support (default is yes) --enable-luamodule Compiles the lua module (default is yes) + --enable-monolithic-luamodule + Compile a monolithic lua module (default is no) --enable-customwxbind-install Installs wxBind sources for custom builds (default *************** *** 2440,2443 **** --- 2443,2453 ---- fi + # Check whether --enable-monolithic_luamodule was given. + if test "${enable_monolithic_luamodule+set}" = set; then + enableval=$enable_monolithic_luamodule; + else + enable_monolithic_luamodule=no + fi + # Check whether --enable-customwxbind-install was given. if test "${enable_customwxbind_install+set}" = set; then *************** *** 2783,2786 **** --- 2793,2809 ---- + { echo "$as_me:$LINENO: checking for the --enable-monolithic-luamodule option" >&5 + echo $ECHO_N "checking for the --enable-monolithic-luamodule option... $ECHO_C" >&6; } + if [ "x$enable_monolithic_luamodule" = "xyes" ]; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + MONOLITHIC_LUAMODULE=1 + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + MONOLITHIC_LUAMODULE=0 + fi + + { echo "$as_me:$LINENO: checking for the --enable-customwxbind-install option" >&5 *************** *** 13182,13185 **** --- 13205,13218 ---- fi + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x0" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1="" + fi + + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="#" + if test "x$MONOLITHIC_LUAMODULE" = "x1" -a "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1="" + fi + COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then *************** *** 13297,13305 **** fi - COND_SHARED_1_USE_LUAMODULE_1="#" - if test "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then - COND_SHARED_1_USE_LUAMODULE_1="" - fi - COND_SHARED_1_USE_SYSTEM_LUA_0="#" if test "x$SHARED" = "x1" -a "x$USE_SYSTEM_LUA" = "x0" ; then --- 13330,13333 ---- *************** *** 14309,14312 **** --- 14337,14342 ---- COND_ICC_PCH_1!$COND_ICC_PCH_1$ac_delim COND_INSTALL_CUSTOM_WXBIND_1!$COND_INSTALL_CUSTOM_WXBIND_1$ac_delim + COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1!$COND_MONOLITHIC_LUAMODULE_0_SHARED_1_USE_LUAMODULE_1$ac_delim + COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1!$COND_MONOLITHIC_LUAMODULE_1_SHARED_1_USE_LUAMODULE_1$ac_delim COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim *************** *** 14332,14336 **** COND_SHARED_0_USE_WXLUASOCKET_1!$COND_SHARED_0_USE_WXLUASOCKET_1$ac_delim COND_SHARED_1!$COND_SHARED_1$ac_delim - COND_SHARED_1_USE_LUAMODULE_1!$COND_SHARED_1_USE_LUAMODULE_1$ac_delim COND_SHARED_1_USE_SYSTEM_LUA_0!$COND_SHARED_1_USE_SYSTEM_LUA_0$ac_delim COND_SHARED_1_USE_WXBINDADV_1!$COND_SHARED_1_USE_WXBINDADV_1$ac_delim --- 14362,14365 ---- *************** *** 14352,14356 **** COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim - COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim _ACEOF --- 14381,14384 ---- *************** *** 14394,14397 **** --- 14422,14426 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim *************** *** 14406,14410 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then break elif $ac_last_try; then --- 14435,14439 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then break elif $ac_last_try; then *************** *** 14786,14789 **** --- 14815,14822 ---- echo + # note that these use the _INV_ version of the macros since in the bakefiles + # the associated "cond" property are respectively USE_SYSTEM_LUA=='0' and + # SHARED=='0' and USE_SYSTEM_LUA=='1' + if [ "x$USE_SYSTEM_LUA" = "x0" ]; then echo " - Lua interpreter: yes" *************** *** 14804,14807 **** --- 14837,14842 ---- + # these use "normal" versions of the macros + if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then echo " - wxLua application: yes" *************** *** 14966,14972 **** if [ "x$USE_WXLUADEBUG" = "x1" ]; then ! echo " - enable_wxluadebug module: yes" elif [ "x$USE_WXLUADEBUG" = "x0" ]; then ! echo " - enable_wxluadebug module: no" else echo "USE_WXLUADEBUG is $USE_WXLUADEBUG" --- 15001,15007 ---- if [ "x$USE_WXLUADEBUG" = "x1" ]; then ! echo " - enable_wxluadebug module: yes" elif [ "x$USE_WXLUADEBUG" = "x0" ]; then ! echo " - enable_wxluadebug module: no" else echo "USE_WXLUADEBUG is $USE_WXLUADEBUG" *************** *** 14975,14981 **** if [ "x$USE_WXLUASOCKET" = "x1" ]; then ! echo " - enable_wxluasocket module: yes" elif [ "x$USE_WXLUASOCKET" = "x0" ]; then ! echo " - enable_wxluasocket module: no" else echo "USE_WXLUASOCKET is $USE_WXLUASOCKET" --- 15010,15016 ---- if [ "x$USE_WXLUASOCKET" = "x1" ]; then ! echo " - enable_wxluasocket module: yes" elif [ "x$USE_WXLUASOCKET" = "x0" ]; then ! echo " - enable_wxluasocket module: no" else echo "USE_WXLUASOCKET is $USE_WXLUASOCKET" *************** *** 14984,14990 **** if [ "x$USE_LUAMODULE" = "x1" ]; then ! echo " - enable_luamodule module: yes" elif [ "x$USE_LUAMODULE" = "x0" ]; then ! echo " - enable_luamodule module: no" else echo "USE_LUAMODULE is $USE_LUAMODULE" --- 15019,15025 ---- if [ "x$USE_LUAMODULE" = "x1" ]; then ! echo " - enable_luamodule module: yes" elif [ "x$USE_LUAMODULE" = "x0" ]; then ! echo " - enable_luamodule module: no" else echo "USE_LUAMODULE is $USE_LUAMODULE" *************** *** 14992,14995 **** --- 15027,15039 ---- + if [ "x$MONOLITHIC_LUAMODULE" = "x1" ]; then + echo " - enable_monolithic_luamodule module: yes" + elif [ "x$MONOLITHIC_LUAMODULE" = "x0" ]; then + echo " - enable_monolithic_luamodule module: no" + else + echo "MONOLITHIC_LUAMODULE is $MONOLITHIC_LUAMODULE" + fi + + # miscellaneous echo |
|
From: John L. <jr...@us...> - 2008-01-19 21:37:21
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** makefile.vc 17 Jan 2008 00:37:39 -0000 1.80 --- makefile.vc 19 Jan 2008 21:37:13 -0000 1.81 *************** *** 115,118 **** --- 115,121 ---- USE_LUAMODULE = 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE = 0 + *************** *** 123,128 **** [...2660 lines suppressed...] + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluasocket\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluadebug\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\dummy.cpp + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxlua\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\dummy.cpp + Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** makefile.bcc 17 Jan 2008 00:37:38 -0000 1.81 --- makefile.bcc 19 Jan 2008 21:37:11 -0000 1.82 *************** *** 180,183 **** --- 180,188 ---- !endif + # Build a monolithic Lua module ? [0,1] + !ifndef MONOLITHIC_LUAMODULE + MONOLITHIC_LUAMODULE = 0 + !endif + [...2309 lines suppressed...] + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluasocket\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluasocket\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxluadebug\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxluadebug\src\dummy.cpp + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxlua\src\dummy.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxlua\src\dummy.cpp + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** makefile.wat 17 Jan 2008 00:37:41 -0000 1.80 --- makefile.wat 19 Jan 2008 21:37:13 -0000 1.81 *************** *** 115,118 **** --- 115,121 ---- USE_LUAMODULE = 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE = 0 + *************** *** 152,156 **** [...2910 lines suppressed...] + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxbind\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxluasocket\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxluadebug\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj : .AUTODEPEND ..\..\wxlua\src\dummy.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** makefile.gcc 17 Jan 2008 00:37:39 -0000 1.80 --- makefile.gcc 19 Jan 2008 21:37:13 -0000 1.81 *************** *** 109,112 **** --- 109,115 ---- USE_LUAMODULE := 1 + # Build a monolithic Lua module ? [0,1] + MONOLITHIC_LUAMODULE := 0 + *************** *** 118,122 **** [...2472 lines suppressed...] + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxbind/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxluasocket/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxluadebug/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.o: ../../wxlua/src/dummy.cpp + $(CXX) -c -o $@ $(MOD_LUAMODULE_MONO_CXXFLAGS) $(CPPDEPS) $< + .PHONY: all clean |
|
From: John L. <jr...@us...> - 2008-01-18 06:00:25
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15084/wxLua/docs Modified Files: changelog.txt wxlua.html Log Message: Update Lua from 5.1.2 to 5.1.3 Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wxlua.html 22 Dec 2007 06:07:08 -0000 1.35 --- wxlua.html 18 Jan 2008 06:00:09 -0000 1.36 *************** *** 112,119 **** newer versions of wxWidgets as well as older ones.</li> <li>Lua ! 5.1.2</li> <ul> <li>wxLua ! uses an unmodified copy of Lua 5.1.2 (with patches applied)</li> <li>Any program --- 112,119 ---- newer versions of wxWidgets as well as older ones.</li> <li>Lua ! 5.1.3</li> <ul> <li>wxLua ! uses an unmodified copy of Lua 5.1.3 (with patches applied)</li> <li>Any program *************** *** 2275,2277 **** other functions which are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> </ul> ! </body></html> \ No newline at end of file --- 2275,2277 ---- other functions which are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> </ul> ! </body></html> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** changelog.txt 15 Jan 2008 19:41:11 -0000 1.57 --- changelog.txt 18 Jan 2008 06:00:08 -0000 1.58 *************** *** 121,125 **** now accepts more options and automatically detects the presence/absence of each wxWidgets library when --enable-wxbind* options are left in "auto" mode ! version 2.8.4.2 --- 121,126 ---- now accepts more options and automatically detects the presence/absence of each wxWidgets library when --enable-wxbind* options are left in "auto" mode ! ! * Updated Lua to 5.1.3-rc1 version 2.8.4.2 |
|
From: John L. <jr...@us...> - 2008-01-18 03:43:06
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27192/wxLua/build/bakefiles Modified Files: options.bkl Log Message: Update the Lua source to 5.1.3-rc1 Use <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> so it doesn't get stripped out by bakefile. Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** options.bkl 15 Jan 2008 18:37:27 -0000 1.11 --- options.bkl 18 Jan 2008 03:42:59 -0000 1.12 *************** *** 159,162 **** --- 159,165 ---- </if> + <!-- FIXME this var is stripped with forcing it --> + <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> + <if cond="TARGETING_IDE=='1'"> |
|
From: John L. <jr...@us...> - 2008-01-18 03:43:06
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27192/wxLua/modules/lua/src Modified Files: Makefile lapi.c lauxlib.c lbaselib.c ldo.c liolib.c lparser.c lstate.c lstate.h lua.c lua.h luaconf.h Log Message: Update the Lua source to 5.1.3-rc1 Use <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> so it doesn't get stripped out by bakefile. Index: liolib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/liolib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** liolib.c 12 Jun 2006 03:50:37 -0000 1.2 --- liolib.c 18 Jan 2008 03:43:00 -0000 1.3 *************** *** 107,112 **** static int io_fclose (lua_State *L) { FILE **p = topfile(L); ! int ok = (fclose(*p) == 0); ! *p = NULL; return pushresult(L, ok, NULL); } --- 107,115 ---- static int io_fclose (lua_State *L) { FILE **p = topfile(L); ! int ok = 0; ! if (*p != stdin && *p != stdout && *p != stderr) { ! ok = (fclose(*p) == 0); ! *p = NULL; ! } return pushresult(L, ok, NULL); } *************** *** 130,135 **** static int io_gc (lua_State *L) { FILE *f = *topfile(L); ! /* ignore closed files and standard files */ ! if (f != NULL && f != stdin && f != stdout && f != stderr) aux_close(L); return 0; --- 133,137 ---- static int io_gc (lua_State *L) { FILE *f = *topfile(L); ! if (f != NULL) /* ignore closed files */ aux_close(L); return 0; Index: lbaselib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lbaselib.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lbaselib.c 25 Apr 2007 02:52:20 -0000 1.3 --- lbaselib.c 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 478,490 **** */ static int auxresume (lua_State *L, lua_State *co, int narg) { ! int status; if (!lua_checkstack(co, narg)) luaL_error(L, "too many arguments to resume"); ! if (lua_status(co) == 0 && lua_gettop(co) == 0) { ! lua_pushliteral(L, "cannot resume dead coroutine"); return -1; /* error flag */ } lua_xmove(L, co, narg); status = lua_resume(co, narg); if (status == 0 || status == LUA_YIELD) { --- 478,526 ---- */ + #define CO_RUN 0 /* running */ + #define CO_SUS 1 /* suspended */ + #define CO_NOR 2 /* 'normal' (it resumed another coroutine) */ + #define CO_DEAD 3 + + static const char *const statnames[] = + {"running", "suspended", "normal", "dead"}; + + static int costatus (lua_State *L, lua_State *co) { + if (L == co) return CO_RUN; + switch (lua_status(co)) { + case LUA_YIELD: + return CO_SUS; + case 0: { + lua_Debug ar; + if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */ + return CO_NOR; /* it is running */ + else if (lua_gettop(co) == 0) + return CO_DEAD; + else + return CO_SUS; /* initial state */ + } + default: /* some error occured */ + return CO_DEAD; + } + } + + + static int luaB_costatus (lua_State *L) { + lua_State *co = lua_tothread(L, 1); + luaL_argcheck(L, co, 1, "coroutine expected"); + lua_pushstring(L, statnames[costatus(L, co)]); + return 1; + } + static int auxresume (lua_State *L, lua_State *co, int narg) { ! int status = costatus(L, co); if (!lua_checkstack(co, narg)) luaL_error(L, "too many arguments to resume"); ! if (status != CO_SUS) { ! lua_pushfstring(L, "cannot resume %s coroutine", statnames[status]); return -1; /* error flag */ } lua_xmove(L, co, narg); + lua_setlevel(L, co); status = lua_resume(co, narg); if (status == 0 || status == LUA_YIELD) { *************** *** 557,588 **** - static int luaB_costatus (lua_State *L) { - lua_State *co = lua_tothread(L, 1); - luaL_argcheck(L, co, 1, "coroutine expected"); - if (L == co) lua_pushliteral(L, "running"); - else { - switch (lua_status(co)) { - case LUA_YIELD: - lua_pushliteral(L, "suspended"); - break; - case 0: { - lua_Debug ar; - if (lua_getstack(co, 0, &ar) > 0) /* does it have frames? */ - lua_pushliteral(L, "normal"); /* it is running */ - else if (lua_gettop(co) == 0) - lua_pushliteral(L, "dead"); - else - lua_pushliteral(L, "suspended"); /* initial state */ - break; - } - default: /* some error occured */ - lua_pushliteral(L, "dead"); - break; - } - } - return 1; - } - - static int luaB_corunning (lua_State *L) { if (lua_pushthread(L)) --- 593,596 ---- Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lua.h 25 Apr 2007 02:52:20 -0000 1.3 --- lua.h 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 18,24 **** #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.2" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2007 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" --- 18,24 ---- #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.3" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" *************** *** 246,250 **** ! /* ** =============================================================== ** some useful macros --- 246,250 ---- ! /* ** =============================================================== ** some useful macros *************** *** 295,298 **** --- 295,301 ---- + /* hack */ + LUA_API void lua_setlevel (lua_State *from, lua_State *to); + /* *************** *** 360,364 **** /****************************************************************************** ! * Copyright (C) 1994-2007 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining --- 363,367 ---- /****************************************************************************** ! * Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining Index: lauxlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lauxlib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lauxlib.c 12 Jun 2006 03:50:37 -0000 1.2 --- lauxlib.c 18 Jan 2008 03:43:00 -0000 1.3 *************** *** 245,249 **** int size = libsize(l); /* check whether lib already exists */ ! luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", size); lua_getfield(L, -1, libname); /* get _LOADED[libname] */ if (!lua_istable(L, -1)) { /* not found? */ --- 245,249 ---- int size = libsize(l); /* check whether lib already exists */ ! luaL_findtable(L, LUA_REGISTRYINDEX, "_LOADED", 1); lua_getfield(L, -1, libname); /* get _LOADED[libname] */ if (!lua_istable(L, -1)) { /* not found? */ Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 25 Apr 2007 02:52:20 -0000 1.7 --- Makefile 18 Jan 2008 03:43:00 -0000 1.8 *************** *** 149,154 **** lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ ltm.h lzio.h lmem.h ldo.h ! loadlib.o: loadlib.c lauxlib.h lua.h luaconf.h lobject.h llimits.h \ ! lualib.h lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \ ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h --- 149,153 ---- lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \ ltm.h lzio.h lmem.h ldo.h ! loadlib.o: loadlib.c lua.h luaconf.h lauxlib.h lualib.h lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \ ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h Index: lparser.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lparser.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lparser.c 1 Aug 2007 19:15:31 -0000 1.5 --- lparser.c 18 Jan 2008 03:43:00 -0000 1.6 *************** *** 940,944 **** check_conflict(ls, lh, &nv.v); luaY_checklimit(ls->fs, nvars, LUAI_MAXCCALLS - ls->L->nCcalls, ! "variable names"); assignment(ls, &nv, nvars+1); } --- 940,944 ---- check_conflict(ls, lh, &nv.v); luaY_checklimit(ls->fs, nvars, LUAI_MAXCCALLS - ls->L->nCcalls, ! "variables in assignment"); assignment(ls, &nv, nvars+1); } Index: lua.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lua.c 10 Dec 2007 05:39:05 -0000 1.3 --- lua.c 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 75,78 **** --- 75,80 ---- static int traceback (lua_State *L) { + if (!lua_isstring(L, 1)) /* 'message' not a string? */ + return 1; /* keep it intact */ lua_getfield(L, LUA_GLOBALSINDEX, "debug"); if (!lua_istable(L, -1)) { Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/luaconf.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** luaconf.h 25 Apr 2007 02:52:20 -0000 1.3 --- luaconf.h 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 443,447 **** ** functions to consume unlimited stack space. */ ! #define LUAI_MAXCSTACK 2048 --- 443,449 ---- ** functions to consume unlimited stack space. */ ! #define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER)))) ! #define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX) ! Index: lapi.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lapi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lapi.c 10 Dec 2007 05:39:05 -0000 1.4 --- lapi.c 18 Jan 2008 03:43:00 -0000 1.5 *************** *** 124,127 **** --- 124,132 ---- + LUA_API void lua_setlevel (lua_State *from, lua_State *to) { + to->nCcalls = from->nCcalls; + } + + LUA_API lua_CFunction lua_atpanic (lua_State *L, lua_CFunction panicf) { lua_CFunction old; Index: lstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstate.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lstate.h 29 Mar 2006 05:48:11 -0000 1.2 --- lstate.h 18 Jan 2008 03:43:00 -0000 1.3 *************** *** 113,116 **** --- 113,117 ---- int size_ci; /* size of array `base_ci' */ unsigned short nCcalls; /* number of nested C calls */ + unsigned short baseCcalls; /* nested C calls when resuming coroutine */ lu_byte hookmask; lu_byte allowhook; Index: ldo.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ldo.c 12 Jun 2006 03:50:37 -0000 1.3 --- ldo.c 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 84,88 **** luaF_close(L, L->base); /* close eventual pending closures */ luaD_seterrorobj(L, status, L->base); ! L->nCcalls = 0; L->allowhook = 1; restore_stack_limit(L); --- 84,88 ---- luaF_close(L, L->base); /* close eventual pending closures */ luaD_seterrorobj(L, status, L->base); ! L->nCcalls = L->baseCcalls; L->allowhook = 1; restore_stack_limit(L); *************** *** 366,370 **** ** When returns, all the results are on the stack, starting at the original ** function position. ! */ void luaD_call (lua_State *L, StkId func, int nResults) { if (++L->nCcalls >= LUAI_MAXCCALLS) { --- 366,370 ---- ** When returns, all the results are on the stack, starting at the original ** function position. ! */ void luaD_call (lua_State *L, StkId func, int nResults) { if (++L->nCcalls >= LUAI_MAXCCALLS) { *************** *** 418,429 **** int status; lua_lock(L); ! if (L->status != LUA_YIELD) { ! if (L->status != 0) ! return resume_error(L, "cannot resume dead coroutine"); ! else if (L->ci != L->base_ci) ! return resume_error(L, "cannot resume non-suspended coroutine"); ! } luai_userstateresume(L, nargs); ! lua_assert(L->errfunc == 0 && L->nCcalls == 0); status = luaD_rawrunprotected(L, resume, L->top - nargs); if (status != 0) { /* error? */ --- 418,428 ---- int status; lua_lock(L); ! if (L->status != LUA_YIELD && (L->status != 0 || L->ci != L->base_ci)) ! return resume_error(L, "cannot resume non-suspended coroutine"); ! if (L->nCcalls >= LUAI_MAXCCALLS) ! return resume_error(L, "C stack overflow"); luai_userstateresume(L, nargs); ! lua_assert(L->errfunc == 0); ! L->baseCcalls = ++L->nCcalls; status = luaD_rawrunprotected(L, resume, L->top - nargs); if (status != 0) { /* error? */ *************** *** 432,437 **** L->ci->top = L->top; } ! else status = L->status; lua_unlock(L); return status; --- 431,439 ---- L->ci->top = L->top; } ! else { ! lua_assert(L->nCcalls == L->baseCcalls); status = L->status; + } + --L->nCcalls; lua_unlock(L); return status; *************** *** 442,446 **** luai_userstateyield(L, nresults); lua_lock(L); ! if (L->nCcalls > 0) luaG_runerror(L, "attempt to yield across metamethod/C-call boundary"); L->base = L->top - nresults; /* protect stack slots below */ --- 444,448 ---- luai_userstateyield(L, nresults); lua_lock(L); ! if (L->nCcalls > L->baseCcalls) luaG_runerror(L, "attempt to yield across metamethod/C-call boundary"); L->base = L->top - nresults; /* protect stack slots below */ Index: lstate.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstate.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lstate.c 6 Dec 2006 06:58:23 -0000 1.6 --- lstate.c 18 Jan 2008 03:43:00 -0000 1.7 *************** *** 94,98 **** L->openupval = NULL; L->size_ci = 0; ! L->nCcalls = 0; L->status = 0; L->base_ci = L->ci = NULL; --- 94,98 ---- L->openupval = NULL; L->size_ci = 0; ! L->nCcalls = L->baseCcalls = 0; L->status = 0; L->base_ci = L->ci = NULL; *************** *** 206,210 **** L->ci = L->base_ci; L->base = L->top = L->ci->base; ! L->nCcalls = 0; } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0); lua_assert(G(L)->tmudata == NULL); --- 206,210 ---- L->ci = L->base_ci; L->base = L->top = L->ci->base; ! L->nCcalls = L->baseCcalls = 0; } while (luaD_rawrunprotected(L, callallgcTM, NULL) != 0); lua_assert(G(L)->tmudata == NULL); |
|
From: John L. <jr...@us...> - 2008-01-18 03:43:06
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27192/wxLua/build/msw Modified Files: makefile.gcc makefile.vc makefile.wat Log Message: Update the Lua source to 5.1.3-rc1 Use <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> so it doesn't get stripped out by bakefile. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** makefile.vc 15 Jan 2008 18:37:27 -0000 1.51 --- makefile.vc 18 Jan 2008 03:43:00 -0000 1.52 *************** *** 74,77 **** --- 74,82 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] USE_WXBINDADV = 1 Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.wat 15 Jan 2008 18:37:27 -0000 1.50 --- makefile.wat 18 Jan 2008 03:43:00 -0000 1.51 *************** *** 74,77 **** --- 74,82 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] USE_WXBINDADV = 1 Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** makefile.gcc 15 Jan 2008 18:37:27 -0000 1.48 --- makefile.gcc 18 Jan 2008 03:42:59 -0000 1.49 *************** *** 68,71 **** --- 68,76 ---- RUNTIME_LIBS := dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING := multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] USE_WXBINDADV := 1 |
|
From: John L. <jr...@us...> - 2008-01-18 03:43:04
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27192/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Update the Lua source to 5.1.3-rc1 Use <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> so it doesn't get stripped out by bakefile. Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** wxlstate.cpp 15 Jan 2008 01:04:04 -0000 1.162 --- wxlstate.cpp 18 Jan 2008 03:43:00 -0000 1.163 *************** *** 2560,2563 **** --- 2560,2565 ---- // this function taken from lua.c, the lua executable static int LUACALL wxlua_traceback (lua_State *L) { + if (!lua_isstring(L, 1)) /* 'message' not a string? */ + return 1; /* keep it intact */ lua_getfield(L, LUA_GLOBALSINDEX, "debug"); if (!lua_istable(L, -1)) { |
|
From: John L. <jr...@us...> - 2008-01-18 03:43:03
|
Update of /cvsroot/wxlua/wxLua/modules/lua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27192/wxLua/modules/lua/include Modified Files: lua.h luaconf.h Log Message: Update the Lua source to 5.1.3-rc1 Use <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set> so it doesn't get stripped out by bakefile. Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lua.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lua.h 25 Apr 2007 02:52:20 -0000 1.4 --- lua.h 18 Jan 2008 03:43:00 -0000 1.5 *************** *** 18,24 **** #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.2" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2007 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" --- 18,24 ---- #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.3" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" *************** *** 246,250 **** ! /* ** =============================================================== ** some useful macros --- 246,250 ---- ! /* ** =============================================================== ** some useful macros *************** *** 295,298 **** --- 295,301 ---- + /* hack */ + LUA_API void lua_setlevel (lua_State *from, lua_State *to); + /* *************** *** 360,364 **** /****************************************************************************** ! * Copyright (C) 1994-2007 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining --- 363,367 ---- /****************************************************************************** ! * Copyright (C) 1994-2008 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/luaconf.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** luaconf.h 25 Apr 2007 02:52:20 -0000 1.3 --- luaconf.h 18 Jan 2008 03:43:00 -0000 1.4 *************** *** 443,447 **** ** functions to consume unlimited stack space. */ ! #define LUAI_MAXCSTACK 2048 --- 443,449 ---- ** functions to consume unlimited stack space. */ ! #define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER)))) ! #define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX) ! |
