Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-12-19 06:18:06
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15689/wxLua/docs Modified Files: wxluaref.html Log Message: update wxluaref.html add wxIconBundle Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluaref.html 7 Dec 2006 06:37:11 -0000 1.11 --- wxluaref.html 19 Dec 2006 06:18:02 -0000 1.12 *************** *** 7,11 **** </head> <body> ! <h1>wxLua 2.6.3.0 Class Reference for wxWidgets 2.6.3</h1> <h2>wxWidgets Classes</h2> <a href="#wxANIHandler">wxANIHandler</a> - (Not in wxWidgets reference manual)<br> --- 7,11 ---- </head> <body> ! <h1>wxLua 2.8.0.0 Class Reference for wxWidgets 2.8.0</h1> <h2>wxWidgets Classes</h2> [...4919 lines suppressed...] <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <b><a name="wxXmlResource">wxXmlResource</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> --- 13228,13232 ---- <br> //-----------------------------------------------------------------------------<br> ! // <a href="#wxXmlResource">wxXmlResource</a><br> <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <b><a name="wxXmlResource">wxXmlResource</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> *************** *** 16404,16408 **** <br> // The following methods are nearly equivallent to their similarly named<br> ! // cousins above. The difference is that these methods bypass wxString<br> // and always use a char* even if used in a unicode build of wxWidgets.<br> // In that case the character data will be utf-8 encoded since that is<br> --- 16422,16426 ---- <br> // The following methods are nearly equivallent to their similarly named<br> ! // cousins above. The difference is that these methods bypass <a href="#wxString">wxString</a><br> // and always use a char* even if used in a unicode build of wxWidgets.<br> // In that case the character data will be utf-8 encoded since that is<br> |
|
From: John L. <jr...@us...> - 2006-12-18 17:18:43
|
Update of /cvsroot/wxlua/wxLua/distrib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29819/distrib Modified Files: announce.txt Log Message: add more text to announcement Index: announce.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/announce.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** announce.txt 17 Dec 2006 12:04:23 -0000 1.1 --- announce.txt 18 Dec 2006 17:18:39 -0000 1.2 *************** *** 24,38 **** ---------------------------------------------------------------- ! The wxLua team is pleased to announce a new release of the ! lua bindings to wxWidgets cross-platform GUI library. ! To get wxLua, please go to the Download page at: http://wxlua.sourceforge.net ! wxLua is a lua scripting language wrapper around the wxWidgets ! cross-platform GUI library. It consists of an executable for running ! standalone wxLua scripts and a library for extending C++ programs with a ! fast, small, fully embeddable scripting language. Feedback greatly appreciated ! --- 24,57 ---- ---------------------------------------------------------------- ! The wxLua team is pleased to announce a new release of the ! lua bindings to wxWidgets cross-platform GUI library. This version supports ! wxWidgets 2.6.3 to 2.8.0 and uses lua 5.1. ! wxLua is a lua scripting language wrapper around the C++ wxWidgets ! cross-platform GUI library. It consists of an executable for running ! standalone wxLua scripts, a module for lua programs to load using require, ! and the source code to build a library for extending C++ programs with a ! fast, small, fully embeddable scripting language. ! ! wxWidgets is a cross-platform toolkit that lets developers create ! applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more using a ! single codebase. Unlike other cross-platform toolkits, wxWidgets applications ! look and feel native. This is because wxWidgets uses the platform's own native ! controls rather than emulating them. It's also extensive, free, open-source, ! and mature. ! ! wxLua wraps all the GUI controls that wxWidgets provides as well as common ! dialogs, drawing graphics, image loading, saving, manipulating, file functions, ! sound and media playback, printing, sockets, and more. ! ! ! To learn more about wxLua and to download it, please visit: http://wxlua.sourceforge.net ! To learn about wxWidgets visit: ! ! http://www.wxwidgets.org ! Feedback greatly appreciated ! |
|
From: Francesco M. <fr...@us...> - 2006-12-17 12:04:28
|
Update of /cvsroot/wxlua/wxLua/distrib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6673/distrib Added Files: announce.txt Log Message: added first draft of announcement text for wxLua 2.8.0.0 --- NEW FILE: announce.txt --- Places where to post the announce of a new wxLua release: --------------------------------------------------------- lua-users mailing list: lu...@ba... wx-users mailing list: wx-...@li... wx-announce mailing list: wx-...@li... wxLua news tracker: http://sourceforge.net/news/submit.php?group_id=140042 wxForum announcement board: http://wxforum.shadonet.com/viewforum.php?f=10 wxCommunity news: http://www.wxcommunity.com/modules.php?op=modload&name=Submit_News&file=index The announcement text: ---------------------- Here it is the announcement text used for last release of wxLua: Announcing wxLua 2.8.0.0: lua bindings to wxWidgets ---------------------------------------------------------------- The wxLua team is pleased to announce a new release of the lua bindings to wxWidgets cross-platform GUI library. To get wxLua, please go to the Download page at: http://wxlua.sourceforge.net wxLua is a lua scripting language wrapper around the wxWidgets cross-platform GUI library. It consists of an executable for running standalone wxLua scripts and a library for extending C++ programs with a fast, small, fully embeddable scripting language. Feedback greatly appreciated ! The wxLua developers |
|
From: Francesco M. <fr...@us...> - 2006-12-17 11:32:25
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24832/build/bakefiles Modified Files: wxluabase.bkl Log Message: fixed to use the _real_ wxWidgets-like BUILDDIR (I forgot WX_PORT) Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxluabase.bkl 16 Dec 2006 12:08:19 -0000 1.28 --- wxluabase.bkl 17 Dec 2006 11:32:21 -0000 1.29 *************** *** 144,148 **** <if cond="FORMAT!='autoconf'"> <set var="BUILDDIR"> ! $(COMPILER)$(WXLUA_LIBPOSTFIX)$(SHARED_SUFFIX) </set> </if> --- 144,148 ---- <if cond="FORMAT!='autoconf'"> <set var="BUILDDIR"> ! $(COMPILER)$(WX_PORT)_$(WXLUA_LIBPOSTFIX)$(SHARED_SUFFIX) </set> </if> |
|
From: Francesco M. <fr...@us...> - 2006-12-17 11:26:41
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21695/bin Modified Files: .cvsignore Log Message: updated CVSIGNORE after BUILDDIR change Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/bin/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 20 May 2006 20:36:35 -0000 1.3 --- .cvsignore 17 Dec 2006 11:26:38 -0000 1.4 *************** *** 1,3 **** *lua* bin2c* ! *.dll \ No newline at end of file --- 1,5 ---- *lua* bin2c* ! *.dll ! *_lib ! *_dll |
|
From: Francesco M. <fr...@us...> - 2006-12-17 11:26:41
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21695/apps/build/msw Modified Files: .cvsignore Log Message: updated CVSIGNORE after BUILDDIR change Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 12 Jun 2005 21:21:11 -0000 1.1 --- .cvsignore 17 Dec 2006 11:26:37 -0000 1.2 *************** *** 1,6 **** ! borland* ! msvc* ! mingw* ! watcom* *.vcproj *.user --- 1,6 ---- ! bcc* ! vc* ! gcc* ! wat* *.vcproj *.user |
|
From: Francesco M. <fr...@us...> - 2006-12-17 11:26:41
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21695/modules/build/msw Modified Files: .cvsignore Log Message: updated CVSIGNORE after BUILDDIR change Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 12 Jun 2005 21:21:11 -0000 1.1 --- .cvsignore 17 Dec 2006 11:26:38 -0000 1.2 *************** *** 1,6 **** ! borland* ! msvc* ! mingw* ! watcom* *.vcproj *.user --- 1,6 ---- ! bcc* ! vc* ! gcc* ! wat* *.vcproj *.user |
|
From: Francesco M. <fr...@us...> - 2006-12-17 11:26:41
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21695/build/msw Added Files: .cvsignore Log Message: updated CVSIGNORE after BUILDDIR change --- NEW FILE: .cvsignore --- vc* bcc* mingw* |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:47:44
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2357 Modified Files: Makefile.in Log Message: fixed installing stuff on Unix since autopackage stuff is now in distrib subdir Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 8 Dec 2006 13:19:56 -0000 1.19 --- Makefile.in 17 Dec 2006 10:47:41 -0000 1.20 *************** *** 98,102 **** desktop: @mkdir -p $(DESTDIR)$(datadir)/applications ! @for f in build/autopackage/wxlua.desktop; do \ if test ! -f $(DESTDIR)$(datadir)/applications/$$f -a ! -d $(DESTDIR)$(datadir)/applications/$$f ; \ then x=yep ; \ --- 98,102 ---- desktop: @mkdir -p $(DESTDIR)$(datadir)/applications ! @for f in distrib/autopackage/wxlua.desktop; do \ if test ! -f $(DESTDIR)$(datadir)/applications/$$f -a ! -d $(DESTDIR)$(datadir)/applications/$$f ; \ then x=yep ; \ *************** *** 110,114 **** mime: @mkdir -p $(DESTDIR)$(datadir)/mime/packages ! @for f in build/autopackage/wxlua.xml; do \ if test ! -f $(DESTDIR)$(datadir)/mime/packages/$$f -a ! -d $(DESTDIR)$(datadir)/mime/packages/$$f ; \ then x=yep ; \ --- 110,114 ---- mime: @mkdir -p $(DESTDIR)$(datadir)/mime/packages ! @for f in distrib/autopackage/wxlua.xml; do \ if test ! -f $(DESTDIR)$(datadir)/mime/packages/$$f -a ! -d $(DESTDIR)$(datadir)/mime/packages/$$f ; \ then x=yep ; \ |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:47:44
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2357/build/bakefiles Modified Files: wxlua.bkl Log Message: fixed installing stuff on Unix since autopackage stuff is now in distrib subdir Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlua.bkl 12 Dec 2006 14:52:36 -0000 1.29 --- wxlua.bkl 17 Dec 2006 10:47:41 -0000 1.30 *************** *** 132,140 **** <copy-files id="desktop" template="srcstuff" cond="TARGETING_UNIX=='1'"> <dstdir>$(DESTDIR)$(DATADIR)/applications</dstdir> ! <files>build/autopackage/wxlua.desktop</files> </copy-files> <copy-files id="mime" template="srcstuff" cond="TARGETING_UNIX=='1'"> <dstdir>$(DESTDIR)$(DATADIR)/mime/packages</dstdir> ! <files>build/autopackage/wxlua.xml</files> </copy-files> <copy-files id="icon" template="srcstuff" cond="TARGETING_UNIX=='1'"> --- 132,140 ---- <copy-files id="desktop" template="srcstuff" cond="TARGETING_UNIX=='1'"> <dstdir>$(DESTDIR)$(DATADIR)/applications</dstdir> ! <files>distrib/autopackage/wxlua.desktop</files> </copy-files> <copy-files id="mime" template="srcstuff" cond="TARGETING_UNIX=='1'"> <dstdir>$(DESTDIR)$(DATADIR)/mime/packages</dstdir> ! <files>distrib/autopackage/wxlua.xml</files> </copy-files> <copy-files id="icon" template="srcstuff" cond="TARGETING_UNIX=='1'"> |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:47:11
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2227 Modified Files: cansim.cpp cansim.h Log Message: removed tabs in favour of spaces; use wxID_EXIT instead of ID_QUIT to get automatic stock icon on GTK2, minor cleaning Index: cansim.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** cansim.cpp 12 Jun 2006 22:27:14 -0000 1.10 --- cansim.cpp 17 Dec 2006 10:47:07 -0000 1.11 *************** *** 43,56 **** wxlLuaCanCmd* GetCmdhMain() { return mainCan->GetCmdh(); } - // WDR: event table for MyFrame - BEGIN_EVENT_TABLE(MyFrame,wxFrame) - EVT_MENU(ID_QUIT, MyFrame::OnQuit) EVT_CLOSE(MyFrame::OnCloseWindow) ! EVT_TIMER(-1, MyFrame::OnTimer) EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) EVT_MENU( lua_script, MyFrame::OnRunScript) EVT_MENU( wxID_UNDO, MyFrame::OnUndo) EVT_MENU( wxID_REDO, MyFrame::OnRedo) END_EVENT_TABLE() --- 43,55 ---- wxlLuaCanCmd* GetCmdhMain() { return mainCan->GetCmdh(); } BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_CLOSE(MyFrame::OnCloseWindow) ! EVT_TIMER(wxID_ANY, MyFrame::OnTimer) ! EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) EVT_MENU( lua_script, MyFrame::OnRunScript) EVT_MENU( wxID_UNDO, MyFrame::OnUndo) EVT_MENU( wxID_REDO, MyFrame::OnRedo) + EVT_MENU( wxID_EXIT, MyFrame::OnQuit) END_EVENT_TABLE() *************** *** 72,76 **** SetIcon(wxICON(wxLuaSmall)); ! m_interp = wxLuaState(NULL, wxID_ANY); m_interp.SetEventHandler( &wxGetApp() ); --- 71,75 ---- SetIcon(wxICON(wxLuaSmall)); ! m_interp = wxLuaState(NULL, wxID_ANY); m_interp.SetEventHandler( &wxGetApp() ); *************** *** 84,108 **** m_canvas->SetVirtualSize( 1000, 1000 ); m_canvas->SetScrollRate( 50, 50 ); ! m_canvas->SetBackgroundColour( wxColour( 223,234,251)); ! m_canvas->SetBackgroundBrush( wxBrush( wxColour( 30,174,171), wxCROSS_HATCH ) ); ! m_canvas->SetYaxis( false ); //true ); //defines the minimum x and y to show and the number of world units per pixel in x and y m_canvas->SetMappingUpp( m_xOrigin, m_yOrigin, m_xScale, m_yScale ); ! wxlCanObjRect* rect = new wxlCanObjRect( 170, 170,200, -120 ); ! rect->SetPen(*wxGREEN_PEN); ! rect->SetBrush( wxBrush( wxColour( 70, 124,71) ) ); ! m_canvas->AddObject( rect ); ! wxlCanObjCircle* circs = new wxlCanObjCircle( 0, 0, 20 ); ! circs->SetPen(*wxBLACK_PEN); ! circs->SetBrush( wxBrush( wxColour( 30,174,71) ) ); ! rect->AddObject( circs ); ! wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,100 ); ! circ->SetPen(*wxRED_PEN); ! circ->SetBrush( wxBrush( wxColour( 30,74,71), wxFDIAGONAL_HATCH ) ); ! m_canvas->AddObject( circ ); m_timer = new wxTimer( this ); --- 83,107 ---- m_canvas->SetVirtualSize( 1000, 1000 ); m_canvas->SetScrollRate( 50, 50 ); ! m_canvas->SetBackgroundColour( wxColour( 223,234,251)); ! m_canvas->SetBackgroundBrush( wxBrush( wxColour( 30,174,171), wxCROSS_HATCH ) ); ! m_canvas->SetYaxis( false ); //true ); //defines the minimum x and y to show and the number of world units per pixel in x and y m_canvas->SetMappingUpp( m_xOrigin, m_yOrigin, m_xScale, m_yScale ); ! wxlCanObjRect* rect = new wxlCanObjRect( 170, 170,200, -120 ); ! rect->SetPen(*wxGREEN_PEN); ! rect->SetBrush( wxBrush( wxColour( 70, 124,71) ) ); ! m_canvas->AddObject( rect ); ! wxlCanObjCircle* circs = new wxlCanObjCircle( 0, 0, 20 ); ! circs->SetPen(*wxBLACK_PEN); ! circs->SetBrush( wxBrush( wxColour( 30,174,71) ) ); ! rect->AddObject( circs ); ! wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,100 ); ! circ->SetPen(*wxRED_PEN); ! circ->SetBrush( wxBrush( wxColour( 30,74,71), wxFDIAGONAL_HATCH ) ); ! m_canvas->AddObject( circ ); m_timer = new wxTimer( this ); *************** *** 118,122 **** { wxMenu *file_menu = new wxMenu; ! file_menu->Append( ID_QUIT, _T("Quit..."), _T("Quit program") ); wxMenu *menuMap = new wxMenu; --- 117,121 ---- { wxMenu *file_menu = new wxMenu; ! file_menu->Append( wxID_EXIT, _T("Quit..."), _T("Quit program") ); wxMenu *menuMap = new wxMenu; *************** *** 170,174 **** void MyFrame::OnQuit( wxCommandEvent & ) { ! Close( true ); } --- 169,173 ---- void MyFrame::OnQuit( wxCommandEvent & ) { ! Close( true ); } *************** *** 221,225 **** case Axis_Vertic: m_yAxisReversed = !m_yAxisReversed; ! m_canvas->SetYaxis(m_yAxisReversed); break; --- 220,224 ---- case Axis_Vertic: m_yAxisReversed = !m_yAxisReversed; ! m_canvas->SetYaxis(m_yAxisReversed); break; *************** *** 236,243 **** case Object_AddCircle: { ! wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,50 ); ! circ->SetPen(*wxGREEN_PEN); ! circ->SetBrush( wxBrush( wxColour(130,74,71), wxCROSSDIAG_HATCH ) ); ! m_canvas->AddObject( circ ); m_canvas->GetCmdh()->MoveObject( -1, 100,100 ); --- 235,242 ---- case Object_AddCircle: { ! wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,50 ); ! circ->SetPen(*wxGREEN_PEN); ! circ->SetBrush( wxBrush( wxColour(130,74,71), wxCROSSDIAG_HATCH ) ); ! m_canvas->AddObject( circ ); m_canvas->GetCmdh()->MoveObject( -1, 100,100 ); *************** *** 260,276 **** _(""), _(""), ! _("lua"), ! _("*.lua") , 0, this ! ); ! if ( !fullPath.IsEmpty() && ::wxFileExists( fullPath ) ) ! { ! if ( 0 != m_interp.RunFile( fullPath ) ) ! { ! wxLogWarning( _("Error in Lua Script") ); ! } ! } } --- 259,275 ---- _(""), _(""), ! _("lua"), ! _("*.lua") , 0, this ! ); ! if ( !fullPath.IsEmpty() && ::wxFileExists( fullPath ) ) ! { ! if ( 0 != m_interp.RunFile( fullPath ) ) ! { ! wxLogWarning( _("Error in Lua Script") ); ! } ! } } *************** *** 307,311 **** } - void MyApp::OnLua( wxLuaEvent &event ) { --- 306,309 ---- Index: cansim.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cansim.h 5 Sep 2006 21:48:11 -0000 1.4 --- cansim.h 17 Dec 2006 10:47:07 -0000 1.5 *************** *** 27,32 **** //---------------------------------------------------------------------------- - #define ID_QUIT 101 - // IDs the menu commands enum --- 27,30 ---- *************** *** 78,82 **** wxTimer *m_timer; ! wxLuaState m_interp; private: --- 76,80 ---- wxTimer *m_timer; ! wxLuaState m_interp; private: *************** *** 93,97 **** void OnOption(wxCommandEvent& event); ! void OnRunScript(wxCommandEvent& event); double m_xScale; --- 91,95 ---- void OnOption(wxCommandEvent& event); ! void OnRunScript(wxCommandEvent& event); double m_xScale; *************** *** 108,111 **** --- 106,111 ---- extern wxlCan* GetCan(); extern wxlLuaCanCmd* GetCmdhMain(); + + //---------------------------------------------------------------------------- // MyApp |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:33:40
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28196/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_luamodule.dsp modules_mod_verbatimlua.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: rebaked after fixing vc_dll problem, BUILDDIR change, new default for WX_VERSION Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** makefile.bcc 12 Dec 2006 14:53:47 -0000 1.56 --- makefile.bcc 17 Dec 2006 10:33:35 -0000 1.57 *************** *** 77,81 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 77,81 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 28 !endif [...1851 lines suppressed...] $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) $** Index: modules_mod_verbatimlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_verbatimlua.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_verbatimlua.dsp 11 Dec 2006 00:08:21 -0000 1.5 --- modules_mod_verbatimlua.dsp 17 Dec 2006 10:33:36 -0000 1.6 *************** *** 48,71 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26ud_lua.lib" /debug ! # ADD LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" --- 48,71 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug ! # ADD LINK32 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\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Debug Multilib" *************** *** 73,96 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prjud_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.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\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26ud_lua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.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\wxlua_msw26ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" --- 73,96 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcuddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug ! # ADD LINK32 wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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\wxlua_msw28ud_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Monolithic" *************** *** 98,121 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26u_lua.lib" ! # ADD LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" --- 98,121 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcudll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcudll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" ! # ADD LINK32 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\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Unicode Release Multilib" *************** *** 123,146 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prju_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.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\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26u_lua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.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\wxlua_msw26u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" --- 123,146 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcudll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcudll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" ! # ADD LINK32 wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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\wxlua_msw28u_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Monolithic" *************** *** 148,171 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26d_lua.lib" /debug ! # ADD LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" --- 148,171 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug ! # ADD LINK32 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\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Debug Multilib" *************** *** 173,196 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prjd_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.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\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26d_lua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.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\wxlua_msw26d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" --- 173,196 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcddll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcddll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "_DEBUG" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d "_DEBUG" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug ! # ADD LINK32 wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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\wxlua_msw28d_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_lua.lib" /debug !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Monolithic" *************** *** 198,221 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26_lua.lib" ! # ADD LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\lib\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" --- 198,221 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcdll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" ! # ADD LINK32 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\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 DLL Release Multilib" *************** *** 223,246 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\lib" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\lib" ! # PROP Intermediate_Dir "msvc6prj_shared\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\include" /I "$(WXWIN)\contrib\include" /Fd..\..\lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.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\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26_lua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.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\wxlua_msw26_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\lib\wxlua_msw26_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" --- 223,246 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" ! # PROP Intermediate_Dir "vcdll\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_lua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_LUA" /D "LUA_BUILD_AS_DLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_LUA" /d LUA_BUILD_AS_DLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" ! # ADD LINK32 wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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\wxlua_msw28_lua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Monolithic" *************** *** 249,261 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 249,261 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 264,269 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" --- 264,269 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_lua.lib" !ELSEIF "$(CFG)" == "mod_verbatimlua - Win32 Unicode Debug Multilib" *************** *** 272,284 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 272,284 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "vcud\mod_verbatimlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "vcud\mod_verbatimlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_lua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 287,292 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LI... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:33:40
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28196/apps/build/msw Modified Files: apps_app_verbatimlua.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after fixing vc_dll problem, BUILDDIR change, new default for WX_VERSION Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.bcc 12 Dec 2006 14:53:47 -0000 1.55 --- makefile.bcc 17 Dec 2006 10:33:35 -0000 1.56 *************** *** 77,81 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 77,81 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 28 !endif *************** *** 135,139 **** $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_verbatimlua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 135,139 ---- $(CFLAGS) APP_VERBATIMLUA_OBJECTS = \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_verbatimlua_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 142,147 **** -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 142,147 ---- -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 151,156 **** -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 151,156 ---- -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 160,168 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 160,168 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 171,175 **** -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj ### Conditionally set variables: ### --- 171,175 ---- -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj ### Conditionally set variables: ### *************** *** 179,186 **** !endif !if "$(SHARED)" == "0" ! SHARED_SUFFIX = static !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = shared !endif !if "$(SHARED)" == "0" --- 179,186 ---- !endif !if "$(SHARED)" == "0" ! SHARED_SUFFIX = !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = dll !endif !if "$(SHARED)" == "0" *************** *** 385,391 **** ! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### --- 385,391 ---- ! all: bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 394,400 **** clean: ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds --- 394,400 ---- clean: ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.exe -if exist ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds del ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\wxlua-lua.tds *************** *** 434,507 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_verbatimlua_lua.obj: ..\..\..\modules\lua\src\lua.c $(CC) -q -c -P- -o$@ $(APP_VERBATIMLUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i..\..\..\modules\wxbind\setup $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAFREEZE_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 434,507 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_verbatimlua_lua.obj: ..\..\..\modules\lua\src\lua.c $(CC) -q -c -P- -o$@ $(APP_VERBATIMLUA_CFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj: ..\..\wxluaedit\src\wxluaedit.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAEDIT_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i..\..\..\modules\wxbind\setup $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUAFREEZE_CXXFLAGS) $** ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** apps_app_wxlua.dsp 11 Dec 2006 00:08:18 -0000 1.28 --- apps_app_wxlua.dsp 17 Dec 2006 10:33:34 -0000 1.29 *************** *** 49,58 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 49,58 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" ! # PROP BASE Intermediate_Dir "vcuddll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_dll" ! # PROP Intermediate_Dir "vcuddll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.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 /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.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 /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 74,83 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" ! # PROP BASE Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_dll" ! # PROP Intermediate_Dir "msvc6prjud_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 74,83 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_dll" ! # PROP BASE Intermediate_Dir "vcuddll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_dll" ! # PROP Intermediate_Dir "vcuddll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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 /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.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 /machine:i386 /out:"..\..\..\bin\vcud_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 99,108 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vcu_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 99,108 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" ! # PROP BASE Intermediate_Dir "vcudll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vcu_dll" ! # PROP Intermediate_Dir "vcudll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_lua.lib wxmsw28u_stc.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 /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_lua.lib wxmsw28u_stc.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 /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 124,133 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" ! # PROP BASE Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vcu_dll" ! # PROP Intermediate_Dir "msvc6prju_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 124,133 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vcu_dll" ! # PROP BASE Intermediate_Dir "vcudll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vcu_dll" ! # PROP Intermediate_Dir "vcudll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vcu_dll\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_lua.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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 /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_lua.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.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 /machine:i386 /out:"..\..\..\bin\vcu_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Monolithic" *************** *** 149,158 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcd_dll" ! # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 149,158 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" ! # PROP BASE Intermediate_Dir "vcddll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcd_dll" ! # PROP Intermediate_Dir "vcddll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_lua.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_lua.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug Multilib" *************** *** 174,183 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" ! # PROP BASE Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcd_dll" ! # PROP Intermediate_Dir "msvc6prjd_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c --- 174,183 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcd_dll" ! # PROP BASE Intermediate_Dir "vcddll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcd_dll" ! # PROP Intermediate_Dir "vcddll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcd_dll\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_lua.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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 /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_lua.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.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 /machine:i386 /out:"..\..\..\bin\vcd_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Monolithic" *************** *** 199,208 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_dll" ! # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 199,208 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_dll" ! # PROP Intermediate_Dir "vcdll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_lua.lib wxmsw28_stc.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_lua.lib wxmsw28_stc.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release Multilib" *************** *** 224,233 **** # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_dll" ! # PROP BASE Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_dll" ! # PROP Intermediate_Dir "msvc6prj_shared\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c --- 224,233 ---- # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_dll" ! # PROP BASE Intermediate_Dir "vcdll\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_dll" ! # PROP Intermediate_Dir "vcdll\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\vc_dll\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_lua.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_lua.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Monolithic" *************** *** 249,258 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_lib\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c --- 249,258 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_lib" ! # PROP BASE Intermediate_Dir "vcud\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_lib" ! # PROP Intermediate_Dir "vcud\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_lib\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_lib\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_lua.lib wxmsw26ud_stc.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vcud_lib\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.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 /machine:i386 /out:"..\..\..\bin\vcud_lib\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_lua.lib wxmsw28ud_stc.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 /machine:i386 /out:"..\..\..\bin\vcud_lib\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug Multilib" *************** *** 274,283 **** # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud_static\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vcud_lib" ! # PROP Intermediate_Dir "msvc6prjud_static\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\vcud_lib\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c --- 274,283 ---- # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vcud_lib" ! # PROP BASE Intermediate_Dir "vcud\app_wxlua" # PROP BASE Target_Dir... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:33:39
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28196/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after fixing vc_dll problem, BUILDDIR change, new default for WX_VERSION Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** makefile.vc 12 Dec 2006 14:53:47 -0000 1.37 --- makefile.vc 17 Dec 2006 10:33:35 -0000 1.38 *************** *** 50,54 **** # Version of the wx library to build against. ! WX_VERSION = 26 # Use monolithic build of wxWidgets? [0,1] --- 50,54 ---- # Version of the wx library to build against. ! WX_VERSION = 28 # Use monolithic build of wxWidgets? [0,1] *************** *** 109,116 **** !if "$(SHARED)" == "0" ! SHARED_SUFFIX = static !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = shared !endif !if "$(SHARED)" == "0" --- 109,116 ---- !if "$(SHARED)" == "0" ! SHARED_SUFFIX = !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = dll !endif !if "$(SHARED)" == "0" *************** *** 134,140 **** ! all: msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### --- 134,140 ---- ! all: vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 143,149 **** clean: ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean --- 143,149 ---- clean: ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del vc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** makefile.bcc 12 Dec 2006 14:53:47 -0000 1.34 --- makefile.bcc 17 Dec 2006 10:33:35 -0000 1.35 *************** *** 77,81 **** # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 26 !endif --- 77,81 ---- # Version of the wx library to build against. !ifndef WX_VERSION ! WX_VERSION = 28 !endif *************** *** 158,165 **** !if "$(SHARED)" == "0" ! SHARED_SUFFIX = static !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = shared !endif !if "$(SHARED)" == "0" --- 158,165 ---- !if "$(SHARED)" == "0" ! SHARED_SUFFIX = !endif !if "$(SHARED)" == "1" ! SHARED_SUFFIX = dll !endif !if "$(SHARED)" == "0" *************** *** 183,189 **** ! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### --- 183,189 ---- ! all: bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 192,206 **** clean: ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_dll: --- 192,206 ---- clean: ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.csm ! @echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ..\..\lib\bcc_dll: *************** *** 214,228 **** modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat ! @del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat !endif --- 214,228 ---- modules: ! @echo cd ..\..\modules\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\modules.bat !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! call bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat ! @del bcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\apps.bat !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** makefile.wat 12 Dec 2006 14:53:47 -0000 1.36 --- makefile.wat 17 Dec 2006 10:33:35 -0000 1.37 *************** *** 50,54 **** # Version of the wx library to build against. ! WX_VERSION = 26 # Use monolithic build of wxWidgets? [0,1] --- 50,54 ---- # Version of the wx library to build against. ! WX_VERSION = 28 # Use monolithic build of wxWidgets? [0,1] *************** *** 112,119 **** SHARED_SUFFIX = !ifeq SHARED 0 ! SHARED_SUFFIX = static !endif !ifeq SHARED 1 ! SHARED_SUFFIX = shared !endif __WXLUA_BINOUTPUT_FOLDER_FILENAMES = --- 112,119 ---- SHARED_SUFFIX = !ifeq SHARED 0 ! SHARED_SUFFIX = !endif !ifeq SHARED 1 ! SHARED_SUFFIX = dll !endif __WXLUA_BINOUTPUT_FOLDER_FILENAMES = *************** *** 159,165 **** ! all : watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) : ! -if not exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### --- 159,165 ---- ! all : wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) : ! -if not exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 168,176 **** clean : .SYMBOLIC ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk ! -if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean --- 168,176 ---- clean : .SYMBOLIC ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.obj ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.res ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.lbc ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.ilk ! -if exist wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch del wat$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.pch cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** makefile.gcc 12 Dec 2006 14:53:47 -0000 1.35 --- makefile.gcc 17 Dec 2006 10:33:35 -0000 1.36 *************** *** 45,49 **** # Version of the wx library to build against. ! WX_VERSION = 26 # Use monolithic build of wxWidgets? [0,1] --- 45,49 ---- # Version of the wx library to build against. ! WX_VERSION = 28 # Use monolithic build of wxWidgets? [0,1] *************** *** 102,109 **** ifeq ($(SHARED),0) ! SHARED_SUFFIX = static endif ifeq ($(SHARED),1) ! SHARED_SUFFIX = shared endif ifeq ($(SHARED),0) --- 102,109 ---- ifeq ($(SHARED),0) ! SHARED_SUFFIX = endif ifeq ($(SHARED),1) ! SHARED_SUFFIX = dll endif ifeq ($(SHARED),0) *************** *** 133,139 **** ! all: mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ! mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX): ! -if not exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) ### Targets: ### --- 133,139 ---- ! all: gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ! gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX): ! -if not exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) mkdir gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX) ### Targets: ### *************** *** 142,147 **** clean: ! -if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o ! -if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean --- 142,147 ---- clean: ! -if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.o ! -if exist gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d del gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\*.d $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean *************** *** 183,185 **** # Dependencies tracking: ! -include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)/*.d --- 183,185 ---- # Dependencies tracking: ! -include gcc$(WXLIBPOSTFIX)$(SHARED_SUFFIX)/*.d |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:33:38
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28196/modules Modified Files: Makefile.in Log Message: rebaked after fixing vc_dll problem, BUILDDIR change, new default for WX_VERSION Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Makefile.in 11 Dec 2006 00:08:19 -0000 1.50 --- Makefile.in 17 Dec 2006 10:33:35 -0000 1.51 *************** *** 97,103 **** lua/include/lualib.h VERBATIMLUA_DLL_CFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -I$(srcdir)/include \ ! -DWXMAKINGDLL_LUA $(PIC_FLAG) $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) VERBATIMLUA_DLL_OBJECTS = \ verbatimlua_dll_lapi.o \ --- 97,102 ---- lua/include/lualib.h VERBATIMLUA_DLL_CFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_LUA $(PIC_FLAG) \ ! $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) VERBATIMLUA_DLL_OBJECTS = \ verbatimlua_dll_lapi.o \ *************** *** 152,157 **** WXLUA_DLL_CXXFLAGS = $(__wxlua_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -I$(srcdir)/include -DWXMAKINGDLL_WXLUA $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ --- 151,156 ---- WXLUA_DLL_CXXFLAGS = $(__wxlua_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ *************** *** 209,214 **** WXBIND_DLL_CXXFLAGS = $(__wxbind_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -I$(srcdir)/include -DWXMAKINGDLL_WXBIND $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ wxbind_dll_wxlua.o \ --- 208,213 ---- WXBIND_DLL_CXXFLAGS = $(__wxbind_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -DWXMAKINGDLL_WXBIND $(PIC_FLAG) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ wxbind_dll_wxlua.o \ *************** *** 263,268 **** WXBINDSTC_DLL_CXXFLAGS = $(__wxbindstc_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -I$(srcdir)/include -DWXMAKINGDLL_WXBINDSTC $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ wxbindstc_dll_wxstc_bind.o \ --- 262,267 ---- WXBINDSTC_DLL_CXXFLAGS = $(__wxbindstc_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -DWXMAKINGDLL_WXBINDSTC $(PIC_FLAG) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ wxbindstc_dll_wxstc_bind.o \ *************** *** 291,296 **** WXLUADEBUG_DLL_CXXFLAGS = $(__wxluadebug_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -I$(srcdir)/include -DWXMAKINGDLL_WXLUADEBUG $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ wxluadebug_dll_dummy.o \ --- 290,295 ---- WXLUADEBUG_DLL_CXXFLAGS = $(__wxluadebug_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -DWXMAKINGDLL_WXLUADEBUG $(PIC_FLAG) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ wxluadebug_dll_dummy.o \ *************** *** 327,332 **** WXLUASOCKET_DLL_CXXFLAGS = $(__wxluasocket_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -I$(srcdir)/include -DWXMAKINGDLL_WXLUASOCKET $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ wxluasocket_dll_wxluasocket_bind.o \ --- 326,331 ---- WXLUASOCKET_DLL_CXXFLAGS = $(__wxluasocket_dll_PCH_INC) \ -I$(top_srcdir)/modules/wxbind/setup -I$(top_srcdir)/modules \ ! -I./$(top_srcdir) -DWXMAKINGDLL_WXLUASOCKET $(PIC_FLAG) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ wxluasocket_dll_wxluasocket_bind.o \ *************** *** 378,382 **** @COND_SHARED_0@ = uninstall_verbatimlua_lib_headers COND_SHARED_1___verbatimlua_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__verbatimlua_dll___depname = $(COND_SHARED_1___verbatimlua_dll___depname) COND_USE_SOVERLINUX_1___verbatimlua_dll___soname_flags = \ --- 377,381 ---- @COND_SHARED_0@ = uninstall_verbatimlua_lib_headers COND_SHARED_1___verbatimlua_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__verbatimlua_dll___depname = $(COND_SHARED_1___verbatimlua_dll___depname) COND_USE_SOVERLINUX_1___verbatimlua_dll___soname_flags = \ *************** *** 386,390 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__verbatimlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___verbatimlua_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 385,390 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__verbatimlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___verbatimlua_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 411,418 **** @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___verbatimlua_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__verbatimlua_dll___importlib = $(COND_PLATFORM_OS2_1___verbatimlua_dll___importlib) COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__verbatimlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib) @COND_SHARED_1@__install_verbatimlua_dll___depname = \ --- 411,418 ---- @COND_USE_SOSYMLINKS_1@__verbatimlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___verbatimlua_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___verbatimlua_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__verbatimlua_dll___importlib = $(COND_PLATFORM_OS2_1___verbatimlua_dll___importlib) COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__verbatimlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___verbatimlua_dll___importlib) @COND_SHARED_1@__install_verbatimlua_dll___depname = \ *************** *** 442,446 **** @COND_SHARED_0@ uninstall_wxlua_lib_headers COND_SHARED_1___wxlua_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxlua_dll___depname = $(COND_SHARED_1___wxlua_dll___depname) COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags = \ --- 442,446 ---- @COND_SHARED_0@ uninstall_wxlua_lib_headers COND_SHARED_1___wxlua_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxlua_dll___depname = $(COND_SHARED_1___wxlua_dll___depname) COND_USE_SOVERLINUX_1___wxlua_dll___soname_flags = \ *************** *** 450,454 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 450,455 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxlua_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 475,482 **** @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxlua_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = $(COND_PLATFORM_OS2_1___wxlua_dll___importlib) COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib) @COND_GCC_PCH_1@__wxlua_dll_PCH_INC = -I.pch/wxprec_wxlua_dll --- 476,483 ---- @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxlua_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = $(COND_PLATFORM_OS2_1___wxlua_dll___importlib) COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib) @COND_GCC_PCH_1@__wxlua_dll_PCH_INC = -I.pch/wxprec_wxlua_dll *************** *** 509,513 **** @COND_SHARED_0@ uninstall_wxbind_lib_headers COND_SHARED_1___wxbind_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxbind_dll___depname = $(COND_SHARED_1___wxbind_dll___depname) COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags = \ --- 510,514 ---- @COND_SHARED_0@ uninstall_wxbind_lib_headers COND_SHARED_1___wxbind_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1@__wxbind_dll___depname = $(COND_SHARED_1___wxbind_dll___depname) COND_USE_SOVERLINUX_1___wxbind_dll___soname_flags = \ *************** *** 517,521 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 518,523 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbind_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 542,549 **** @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxbind_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = $(COND_PLATFORM_OS2_1___wxbind_dll___importlib) COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxbind_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib) @COND_GCC_PCH_1@__wxbind_dll_PCH_INC = -I.pch/wxprec_wxbind_dll --- 544,551 ---- @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxbind_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = $(COND_PLATFORM_OS2_1___wxbind_dll___importlib) COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxbind_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib) @COND_GCC_PCH_1@__wxbind_dll_PCH_INC = -I.pch/wxprec_wxbind_dll *************** *** 578,582 **** @COND_SHARED_0_USE_WXBINDSTC_1@ = uninstall_wxbindstc_lib_headers COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXBINDSTC_1@__wxbindstc_dll___depname = $(COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname) COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags = \ --- 580,584 ---- @COND_SHARED_0_USE_WXBINDSTC_1@ = uninstall_wxbindstc_lib_headers COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXBINDSTC_1@__wxbindstc_dll___depname = $(COND_SHARED_1_USE_WXBINDSTC_1___wxbindstc_dll___depname) COND_USE_SOVERLINUX_1___wxbindstc_dll___soname_flags = \ *************** *** 586,590 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 588,593 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxbindstc_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxbindstc_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 611,618 **** @COND_USE_SOSYMLINKS_1@__wxbindstc_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxbindstc_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxbindstc_dll___importlib = $(COND_PLATFORM_OS2_1___wxbindstc_dll___importlib) COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxbindstc_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib) @COND_GCC_PCH_1@__wxbindstc_dll_PCH_INC = -I.pch/wxprec_wxbindstc_dll --- 614,621 ---- @COND_USE_SOSYMLINKS_1@__wxbindstc_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxbindstc_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxbindstc_dll___importlib = $(COND_PLATFORM_OS2_1___wxbindstc_dll___importlib) COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxbindstc_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib) @COND_GCC_PCH_1@__wxbindstc_dll_PCH_INC = -I.pch/wxprec_wxbindstc_dll *************** *** 649,653 **** @COND_SHARED_0_USE_WXLUADEBUG_1@ = uninstall_wxluadebug_lib_headers COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUADEBUG_1@__wxluadebug_dll___depname = $(COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname) COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags = \ --- 652,656 ---- @COND_SHARED_0_USE_WXLUADEBUG_1@ = uninstall_wxluadebug_lib_headers COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUADEBUG_1@__wxluadebug_dll___depname = $(COND_SHARED_1_USE_WXLUADEBUG_1___wxluadebug_dll___depname) COND_USE_SOVERLINUX_1___wxluadebug_dll___soname_flags = \ *************** *** 657,661 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 660,665 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluadebug_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 682,689 **** @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxluadebug_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxluadebug_dll___importlib = $(COND_PLATFORM_OS2_1___wxluadebug_dll___importlib) COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluadebug_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib) @COND_GCC_PCH_1@__wxluadebug_dll_PCH_INC = -I.pch/wxprec_wxluadebug_dll --- 686,693 ---- @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxluadebug_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxluadebug_dll___importlib = $(COND_PLATFORM_OS2_1___wxluadebug_dll___importlib) COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluadebug_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib) @COND_GCC_PCH_1@__wxluadebug_dll_PCH_INC = -I.pch/wxprec_wxluadebug_dll *************** *** 720,724 **** @COND_SHARED_0_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_lib_headers COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname = \ ! $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUASOCKET_1@__wxluasocket_dll___depname = $(COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname) COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags = \ --- 724,728 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@ = uninstall_wxluasocket_lib_headers COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname = \ ! $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_SHARED_1_USE_WXLUASOCKET_1@__wxluasocket_dll___depname = $(COND_SHARED_1_USE_WXLUASOCKET_1___wxluasocket_dll___depname) COND_USE_SOVERLINUX_1___wxluasocket_dll___soname_flags = \ *************** *** 728,732 **** $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd .; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ --- 732,737 ---- $(SONAME_FLAG)$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags = $(COND_USE_SOVERSOLARIS_1___wxluasocket_dll___soname_flags) ! COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)/lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2); \ *************** *** 753,760 **** @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxluasocket_dll___importlib = -import \ ! $(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxluasocket_dll___importlib = $(COND_PLATFORM_OS2_1___wxluasocket_dll___importlib) COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib = \ ! -Wl,--out-implib=$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluasocket_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib) @COND_GCC_PCH_1@__wxluasocket_dll_PCH_INC = -I.pch/wxprec_wxluasocket_dll --- 758,765 ---- @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_uninst_cmd) COND_PLATFORM_OS2_1___wxluasocket_dll___importlib = -import \ ! $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_PLATFORM_OS2_1@__wxluasocket_dll___importlib = $(COND_PLATFORM_OS2_1___wxluasocket_dll___importlib) COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib = \ ! -Wl,--out-implib=$(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluasocket_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib) @COND_GCC_PCH_1@__wxluasocket_dll_PCH_INC = -I.pch/wxprec_wxluasocket_dll *************** *** 818,844 **** rm -f ./*.o rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) --- 823,849 ---- rm -f ./*.o rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf2) rm -f $(top_builddir)/lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE) *************** *** 872,876 **** @COND_SHARED_0@ done ! @COND_SHARED_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(VERBATIMLUA_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CC) $@ $(VERBATIMLUA_DLL_OBJECTS) $(LDFLAGS) $(__verbatimlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__verbatimlua_dll___importlib) $(__verbatimlua_dll___macinstnamecmd) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WX_LIBS) @COND_SHARED_1@ --- 877,881 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(VERBATIMLUA_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CC) $@ $(VERBATIMLUA_DLL_OBJECTS) $(LDFLAGS) $(__verbatimlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__verbatimlua_dll___importlib) $(__verbatimlua_dll___macinstnamecmd) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) $(WX_LIBS) @COND_SHARED_1@ *************** *** 879,884 **** @COND_SHARED_1@install_verbatimlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_inst_cmd)) --- 884,889 ---- @COND_SHARED_1@install_verbatimlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__verbatimlua_dll___so_symlinks_inst_cmd)) *************** *** 931,935 **** @COND_SHARED_0@ done ! @COND_SHARED_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUA_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ --- 936,940 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUA_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxlua_dll___importlib) $(__wxlua_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ *************** *** 941,946 **** @COND_SHARED_1@install_wxlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) --- 946,951 ---- @COND_SHARED_1@install_wxlua_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) *************** *** 993,997 **** @COND_SHARED_0@ done ! @COND_SHARED_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBIND_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ --- 998,1002 ---- @COND_SHARED_0@ done ! @COND_SHARED_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBIND_DLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbind_dll___importlib) $(__wxbind_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1@ *************** *** 1003,1008 **** @COND_SHARED_1@install_wxbind_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) --- 1008,1013 ---- @COND_SHARED_1@install_wxbind_dll: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) *************** *** 1055,1059 **** @COND_SHARED_0_USE_WXBINDSTC_1@ done ! @COND_SHARED_1_USE_WXBINDSTC_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ --- 1060,1064 ---- @COND_SHARED_0_USE_WXBINDSTC_1@ done ! @COND_SHARED_1_USE_WXBINDSTC_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxbindstc_dll___importlib) $(__wxbindstc_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ *************** *** 1065,1070 **** @COND_SHARED_1_USE_WXBINDSTC_1@install_wxbindstc_dll: @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_inst_cmd)) --- 1070,1075 ---- @COND_SHARED_1_USE_WXBINDSTC_1@install_wxbindstc_dll: @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXBINDSTC_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_inst_cmd)) *************** *** 1117,1121 **** @COND_SHARED_0_USE_WXLUADEBUG_1@ done ! @COND_SHARED_1_USE_WXLUADEBUG_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUADEBUG_DLL_OBJECTS) @COND_SHARED_1_USE_WXLUADEBUG_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluadebug_dll___importlib) $(__wxluadebug_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUADEBUG_1@ --- 1122,1126 ---- @COND_SHARED_0_USE_WXLUADEBUG_1@ done ! @COND_SHARED_1_USE_WXLUADEBUG_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUADEBUG_DLL_OBJECTS) @COND_SHARED_1_USE_WXLUADEBUG_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluadebug_dll___importlib) $(__wxluadebug_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUADEBUG_1@ *************** *** 1127,1132 **** @COND_SHARED_1_USE_WXLUADEBUG_1@install_wxluadebug_dll: @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXLUADEBUG_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) --- 1132,1137 ---- @COND_SHARED_1_USE_WXLUADEBUG_1@install_wxluadebug_dll: @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXLUADEBUG_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) *************** *** 1179,1183 **** @COND_SHARED_0_USE_WXLUASOCKET_1@ done ! @COND_SHARED_1_USE_WXLUASOCKET_1@$(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluasocket_dll___importlib) $(__wxluasocket_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ --- 1184,1188 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@ done ! @COND_SHARED_1_USE_WXLUASOCKET_1@$(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)/lib $(__wxluasocket_dll___importlib) $(__wxluasocket_dll___macinstnamecmd) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ *************** *** 1189,1194 **** @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DATA) $(srcdir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_PROGRAM) $(srcdir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXLUASOCKET_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) --- 1194,1199 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3) $(DESTDIR)$(libdir) @COND_SHARED_1_USE_WXLUASOCKET_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:32:35
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27976 Added Files: makeautopackage Log Message: added super small utility script --- NEW FILE: makeautopackage --- #!/bin/sh # NB: you can also do "make autopackage" from the # main dir after you ran configure there mkdir toupload rm upload/*.xml upload/*.meta upload/*.package cd ../../.. makeinstaller $@ build/autopackage/default.apspec mv *.xml *.meta *.package build/autopackage/toupload cd build/autopackage |
|
From: Francesco M. <fr...@us...> - 2006-12-17 10:29:53
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26789 Modified Files: wxhacks.bkl Log Message: removed dummy debug message committed by error Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxhacks.bkl 12 Dec 2006 14:52:36 -0000 1.18 --- wxhacks.bkl 17 Dec 2006 10:29:50 -0000 1.19 *************** *** 76,81 **** <if cond="UNICODE=='0'">0</if> </set> - - <echo>defined stuff: $(isdefined('WX_DEBUG'))</echo> </if> --- 76,79 ---- |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:47
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/bindings Modified Files: genwxbind.lua Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** genwxbind.lua 14 Dec 2006 22:02:57 -0000 1.92 --- genwxbind.lua 17 Dec 2006 07:47:14 -0000 1.93 *************** *** 18,23 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 3 -- Used to verify that the bindings are updated ! -- see modules/wxlua/include/wxldefs.h bindingKeywordTable = {} -- Binding keywords used by the generator %XXX --- 18,23 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 4 -- Used to verify that the bindings are updated ! -- This must match modules/wxlua/include/wxldefs.h bindingKeywordTable = {} -- Binding keywords used by the generator %XXX *************** *** 29,42 **** preprocOperatorTable = {} -- Preprocessor operators ! typedefTable = {} -- all typedefs read from the interface files dataTypeTable = {} -- all datatypes; int, double, class names, see AllocDataType dataTypeAttribTable = {} -- attributes for data types; unsigned, const functionAttribTable = {} -- attributes for functions; static, virtual ! enumBindingTable = {} -- table[#if condition][enum name] = { map, condition } ! defineBindingTable = {} -- table[#if condition][define name] = { map, condition } ! defineIncludeBindingTable = {} ! stringBindingTable = {} -- table[#if condition][string name] = { map, condition } ! objectBindingTable = {} -- table[#if condition][object name] = { map, condition } objectTagBindingTable = {} objectIncludeBindingTable = {} --- 29,42 ---- preprocOperatorTable = {} -- Preprocessor operators ! typedefTable = {} -- all %typedefs read from the interface files dataTypeTable = {} -- all datatypes; int, double, class names, see AllocDataType dataTypeAttribTable = {} -- attributes for data types; unsigned, const functionAttribTable = {} -- attributes for functions; static, virtual ! enumBindingTable = {} -- table[#if condition][enum name] = { Map, Condition } ! defineBindingTable = {} -- table[#if condition][define name] = { Map, Condition } ! defineIncludeBindingTable = {} -- table[#if condition][define name] = { Map, Condition } ! stringBindingTable = {} -- table[#if condition][string name] = { Map, Condition } ! objectBindingTable = {} -- table[#if condition][object name] = { Map, Condition } objectTagBindingTable = {} objectIncludeBindingTable = {} *************** *** 147,153 **** -- --------------------------------------------------------------------------- -- Add a value to the table at any number of keys into it ! -- TableAdd(a, value, "b", 2, 5) = a["b"][2][5] = value -- --------------------------------------------------------------------------- ! function TableAdd(atable, value, ...) local t = atable for n = 1, #arg-1 do --- 147,153 ---- -- --------------------------------------------------------------------------- -- Add a value to the table at any number of keys into it ! -- TableAdd(value, atable, "b", 2, 5) = atable["b"][2][5] = value -- --------------------------------------------------------------------------- ! function TableAdd(value, atable, ...) local t = atable for n = 1, #arg-1 do *************** *** 1063,1069 **** bindingKeywordTable["%rename"] = true bindingKeywordTable["%class"] = true ! bindingKeywordTable["%delete"] = true -- keywords that go with %class bindingKeywordTable["%noclassinfo"] = true bindingKeywordTable["%encapsulate"] = true bindingKeywordTable["%constructor"] = true bindingKeywordTable["%static"] = true --- 1063,1071 ---- bindingKeywordTable["%rename"] = true bindingKeywordTable["%class"] = true ! -- keywords come after %class tag ! bindingKeywordTable["%delete"] = true bindingKeywordTable["%noclassinfo"] = true bindingKeywordTable["%encapsulate"] = true + -- keywords that can only be used within %class tag bindingKeywordTable["%constructor"] = true bindingKeywordTable["%static"] = true *************** *** 1610,1613 **** --- 1612,1621 ---- end + -- --------------------------------------------------------------------------- + -- Parse the interface file tags + -- This uses a stack of AllocParseObjects with the top most one the globals + -- classes and enums are temporarily pushed onto it and removed at the end. + -- --------------------------------------------------------------------------- + function ParseData(interfaceData) local objectList = {} *************** *** 1615,1619 **** { ObjectStack = {}, ! ConditionStack = {}, IsBlockComment = false, } --- 1623,1627 ---- { ObjectStack = {}, ! ConditionStack = {}, -- stack of conditions IsBlockComment = false, } *************** *** 1698,1702 **** -- end inline conditionals ! if lineState.InLineConditionIf and not lineState.InLineConditionEndIf then lineState.InLineConditionIf = false lineState.IsLineConditionEndIf = true --- 1706,1710 ---- -- end inline conditionals ! if lineState.InLineConditionIf and not lineState.InLineConditionEndIf then lineState.InLineConditionIf = false lineState.IsLineConditionEndIf = true *************** *** 1712,1717 **** elseif tag == "%endif" then - local condition = parseState.ConditionStack[1] - table.remove(parseState.ConditionStack, 1) -- pop last %if break -- we can stop processing line --- 1720,1723 ---- *************** *** 1979,1983 **** -- Process Interface Data -- ! if lineState.Action == "keyword" and lineState.ActionMandatory then print("Error: Invalid Token '"..tag.."'. "..LineTableErrString(lineTable)) end --- 1985,1989 ---- -- Process Interface Data -- ! if (lineState.Action == "keyword") and lineState.ActionMandatory then print("Error: Invalid Token '"..tag.."'. "..LineTableErrString(lineTable)) end *************** *** 2213,2223 **** lineState.ActionMandatory = true ! elseif (tag == "*") or (tag == "&") then ! table.insert(lineState.DataTypePointer, tag) ! ! lineState.Action = "method" ! lineState.ActionMandatory = true ! ! elseif tag == "[]" then table.insert(lineState.DataTypePointer, tag) --- 2219,2223 ---- lineState.ActionMandatory = true ! elseif (tag == "*") or (tag == "&") or (tag == "[]") then table.insert(lineState.DataTypePointer, tag) *************** *** 2257,2261 **** lineState.DataTypeWithAttrib = lineState.DataType ! if IsDataType(lineState.Name) and lineState.Name ~= parseState.ObjectStack[1].Name then if not IsDataTypeEnum(lineState.Name) then print("Error: Constructor Name ("..lineState.Name..") conflicts with datatype definition. "..LineTableErrString(lineTable)) --- 2257,2261 ---- lineState.DataTypeWithAttrib = lineState.DataType ! if IsDataType(lineState.Name) and (lineState.Name ~= parseState.ObjectStack[1].Name) then if not IsDataTypeEnum(lineState.Name) then print("Error: Constructor Name ("..lineState.Name..") conflicts with datatype definition. "..LineTableErrString(lineTable)) *************** *** 2291,2307 **** elseif lineState.Action == "methodbracket" then if tag ~= '(' then ! local msg = "" ! if lineState.Name then ! msg = "(Name="..lineState.Name.."; " ! else ! msg = "(Undefined Name; " ! end ! ! if lineState.DataType then ! msg = msg.."DataType="..lineState.DataType..")" ! else ! msg = msg.."Undefined DataType)" ! end ! print("Error: Expected Method Tag '(', got Tag='"..tag.."'. "..msg.." "..LineTableErrString(lineTable)) end --- 2291,2295 ---- elseif lineState.Action == "methodbracket" then if tag ~= '(' then ! local msg = "(Name="..tostring(lineState.Name).."; DataType="..tostring(lineState.DataType)..")" print("Error: Expected Method Tag '(', got Tag='"..tag.."'. "..msg.." "..LineTableErrString(lineTable)) end *************** *** 2327,2337 **** lineState.ActionMandatory = true ! elseif (tag == "*") or (tag == "&") then ! table.insert(lineState.ParamState.DataTypePointer, tag) ! ! lineState.Action = "methodparam" ! lineState.ActionMandatory = true ! ! elseif tag == "[]" then table.insert(lineState.ParamState.DataTypePointer, tag) --- 2315,2319 ---- lineState.ActionMandatory = true ! elseif (tag == "*") or (tag == "&") or (tag == "[]") then table.insert(lineState.ParamState.DataTypePointer, tag) *************** *** 2441,2457 **** else ! local msg = "" ! if lineState.ParamState.Name then ! msg = "(Name="..lineState.ParamState.Name.."; " ! else ! msg = "(Undefined Name; " ! end ! ! if lineState.ParamState.DataType then ! msg = msg.."DataType="..lineState.ParamState.DataType..")" ! else ! msg = msg.."Undefined DataType)" ! end ! print("Error: Expected Parameter '=', ')', or ',' got Tag='"..tag.."'. "..msg.." "..LineTableErrString(lineTable)) end --- 2423,2428 ---- else ! local msg = "(Name="..tostring(lineState.ParamState.Name).. ! "; DataType="..tostring(lineState.ParamState.DataType)..")" print("Error: Expected Parameter '=', ')', or ',' got Tag='"..tag.."'. "..msg.." "..LineTableErrString(lineTable)) end *************** *** 2579,2583 **** -- --------------------------------------------------------------------------- ! -- Make a variable from a data type that may contain namespace::var -- --------------------------------------------------------------------------- function MakeVar(type) --- 2550,2555 ---- -- --------------------------------------------------------------------------- ! -- Make a variable from a data type that may contain namespace::var and ! -- convert it to namespace_var -- --------------------------------------------------------------------------- function MakeVar(type) *************** *** 2714,2718 **** local propertyBinding = { ! Map = " { LuaGetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 0, 0, {0} },\n", Condition = propertycondition } --- 2686,2690 ---- local propertyBinding = { ! Map = " { LuaGetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 0, 0, s_wxluaargArray_None },\n", Condition = propertycondition } *************** *** 2726,2730 **** local propertyBinding = { ! Map = " { LuaSetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1, 1, {0} },\n", Condition = propertycondition } --- 2698,2702 ---- local propertyBinding = { ! Map = " { LuaSetProp, \""..member.Name.."\", wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1, 1, s_wxluaargArray_None },\n", Condition = propertycondition } *************** *** 2808,2812 **** { Method = codeList, ! Map = " { LuaMethod, \""..memberGetFunc.."\", "..funcName..", 0, 0, {0} },\n", Condition = membercondition } --- 2780,2784 ---- { Method = codeList, ! Map = " { LuaMethod, \""..memberGetFunc.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = membercondition } *************** *** 2815,2819 **** local propertyBinding = { ! Map = " { LuaGetProp, \""..member.Name.."\", "..funcName..", 0, 0, {0} },\n", Condition = membercondition } --- 2787,2791 ---- local propertyBinding = { ! Map = " { LuaGetProp, \""..member.Name.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = membercondition } *************** *** 2850,2854 **** table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") ! if not numeric and (not memberPtr or (memberPtr == "&")) then table.insert(codeList, " self->"..member.Name.." = *val;\n") else --- 2822,2826 ---- table.insert(codeList, " "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n") ! if not numeric and (not memberPtr or (memberPtr == "&")) then table.insert(codeList, " self->"..member.Name.." = *val;\n") else *************** *** 2864,2868 **** { Method = codeList, ! Map = " { LuaMethod, \""..memberSetFunc.."\", "..funcName..", 0, 0, {0} },\n", Condition = membercondition } --- 2836,2840 ---- { Method = codeList, ! Map = " { LuaMethod, \""..memberSetFunc.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = membercondition } *************** *** 2871,2875 **** propertyBinding = { ! Map = " { LuaSetProp, \""..member.Name.."\", "..funcName..", 0, 0, {0} },\n", Condition = fullcondition } --- 2843,2847 ---- propertyBinding = { ! Map = " { LuaSetProp, \""..member.Name.."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = fullcondition } *************** *** 3471,3474 **** --- 3443,3449 ---- end + local overload_argListName = "s_wxluatagArray_".. funcName + overload_argList = overload_argList.."0 }" + -- add function map only once for the base function name overload local funcMap = nil *************** *** 3476,3482 **** local f = funcNameBase if member.AltName and (member.AltName ~= member.Name) then f = funcName end ! funcMap = " { "..funcType..", \""..funcLuaCall.."\", "..f..", "..paramCount..", "..requiredParamCount..", "..overload_argList.."0 } },\n" end ! local overloadMap = " { "..funcType..", \""..funcLuaCall.."\", "..funcName..", "..paramCount..", "..requiredParamCount..", "..overload_argList.."0 } },\n" --print(parseObject.Name, member.Name, member.IsOverload, overload_argList) --- 3451,3457 ---- local f = funcNameBase if member.AltName and (member.AltName ~= member.Name) then f = funcName end ! funcMap = " { "..funcType..", \""..funcLuaCall.."\", "..f..", "..paramCount..", "..requiredParamCount..", "..overload_argListName.." },\n" end ! local overloadMap = " { "..funcType..", \""..funcLuaCall.."\", "..funcName..", "..paramCount..", "..requiredParamCount..", "..overload_argListName.." },\n" --print(parseObject.Name, member.Name, member.IsOverload, overload_argList) *************** *** 3610,3613 **** --- 3585,3590 ---- CFunctionName = funcName, Method = codeList, + ArgArray = overload_argList, + ArgArrayName = overload_argListName, Map = funcMap, ArgList = overload_argList, *************** *** 3732,3736 **** { Method = codeList, ! Map = " { LuaDelete, \""..MakeVar(parseObject.Name).."\", "..funcName..", 0, 0, {0} },\n", Condition = condition } --- 3709,3713 ---- { Method = codeList, ! Map = " { LuaDelete, \""..MakeVar(parseObject.Name).."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = condition } *************** *** 3760,3764 **** { Method = codeList, ! Map = " { LuaMethod, \"Delete\", "..funcName..", 0, 0, {0} },\n", Condition = condition } --- 3737,3741 ---- { Method = codeList, ! Map = " { LuaMethod, \"Delete\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = condition } *************** *** 3778,3782 **** { Method = codeList, ! Map = " { LuaDelete, \""..MakeVar(parseObject.Name).."\", "..funcName..", 0, 0, {0} },\n", Condition = condition } --- 3755,3759 ---- { Method = codeList, ! Map = " { LuaDelete, \""..MakeVar(parseObject.Name).."\", "..funcName..", 0, 0, s_wxluaargArray_None },\n", Condition = condition } *************** *** 4367,4372 **** for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then ! local lineCount = #functionBinding.Method ! for line=1, lineCount do table.insert(fileData, functionBinding.Method[line]) end --- 4344,4352 ---- for i, functionBinding in pairs_sort(functionBindingList) do if functionBinding.Method then ! if functionBinding.ArgArrayName then ! table.insert(fileData, "static wxLuaArgTag "..functionBinding.ArgArrayName.."[] = "..functionBinding.ArgArray..";\n") ! end ! ! for line = 1, #functionBinding.Method do table.insert(fileData, functionBinding.Method[line]) end *************** *** 4406,4410 **** end ! table.insert(fileData, " { LuaGlobal, 0, 0, 0, 0, {0} }, \n") table.insert(fileData, " };\n") table.insert(fileData, " count = (sizeof(functionList)/sizeof(functionList[0])) - 1;\n") --- 4386,4390 ---- end ! table.insert(fileData, " { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, \n") table.insert(fileData, " };\n") table.insert(fileData, " count = (sizeof(functionList)/sizeof(functionList[0])) - 1;\n") *************** *** 4426,4431 **** table.insert(fileData, "\n") ! local objectCount = #interface.objectData ! for o = 1, objectCount do local object = interface.objectData[o] --- 4406,4410 ---- table.insert(fileData, "\n") ! for o = 1, #interface.objectData do local object = interface.objectData[o] *************** *** 4457,4465 **** end ! local bindCount = #BindTableList ! for i = 1, bindCount do if BindTableList[i].Method then ! local lineCount = #BindTableList[i].Method ! for line=1, lineCount do table.insert(fileData, BindTableList[i].Method[line]) end --- 4436,4446 ---- end ! for i = 1, #BindTableList do ! if BindTableList[i].Method then ! if BindTableList[i].ArgArrayName then ! table.insert(fileData, "static wxLuaArgTag "..BindTableList[i].ArgArrayName.."[] = "..BindTableList[i].ArgArray..";\n") ! end ! for line = 1, #BindTableList[i].Method do table.insert(fileData, BindTableList[i].Method[line]) end *************** *** 4541,4546 **** end ! local bindCount = #BindTableList ! for i=1,bindCount do if BindTableList[i].Map then table.insert(fileData, BindTableList[i].Map) --- 4522,4526 ---- end ! for i = 1, #BindTableList do if BindTableList[i].Map then table.insert(fileData, BindTableList[i].Map) |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:47
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluacan.cpp 13 Dec 2006 00:27:55 -0000 1.16 --- wxluacan.cpp 17 Dec 2006 07:47:14 -0000 1.17 *************** *** 27,30 **** --- 27,31 ---- int s_wxluatag_wxlCanObj = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) *************** *** 46,49 **** --- 47,51 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) *************** *** 62,65 **** --- 64,68 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { 0 }; // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) *************** *** 77,80 **** --- 80,84 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { 0 }; // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) *************** *** 92,95 **** --- 96,100 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 }; // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) *************** *** 108,111 **** --- 113,117 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) *************** *** 129,132 **** --- 135,139 ---- #if wxLUA_USE_wxColourPenBrush + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 }; // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) *************** *** 143,146 **** --- 150,154 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 }; // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) *************** *** 165,179 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, { 0 } }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, { 0 } }, ! { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, { &s_wxluaarg_Boolean, 0 } }, ! { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, {0} }, #if wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, { &s_wxluatag_wxPen, 0 } }, ! { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, { &s_wxluatag_wxBrush, 0 } }, #endif // wxLUA_USE_wxColourPenBrush --- 173,187 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, ! { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluatagArray_wxLua_wxlCanObj_GetX }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluatagArray_wxLua_wxlCanObj_GetY }, ! { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, ! { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }, ! { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }, #endif // wxLUA_USE_wxColourPenBrush *************** *** 189,192 **** --- 197,201 ---- int s_wxluatag_wxlCanObjRect = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) *************** *** 221,226 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} }, }; --- 230,235 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 234,237 **** --- 243,247 ---- int s_wxluatag_wxlCanObjCircle = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) *************** *** 264,269 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} }, }; --- 274,279 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 277,280 **** --- 287,291 ---- int s_wxluatag_wxlCanObjScript = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) *************** *** 307,312 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} }, }; --- 318,323 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 320,323 **** --- 331,335 ---- int s_wxluatag_wxlCanObjAddScript = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) *************** *** 339,342 **** --- 351,355 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 }; // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) *************** *** 364,370 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, {0} }, }; --- 377,383 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, ! { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 378,381 **** --- 391,395 ---- int s_wxluatag_wxlCan = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) *************** *** 392,395 **** --- 406,410 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { 0 }; // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) *************** *** 407,410 **** --- 422,426 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { 0 }; // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) *************** *** 429,432 **** --- 445,449 ---- #if wxLUA_USE_wxPointSizeRect + static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) *************** *** 460,470 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, { 0 } }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, {0} }, #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 } }, #endif // wxLUA_USE_wxPointSizeRect --- 477,487 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluatagArray_wxLua_wxlCan_GetYaxis }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluatagArray_wxLua_wxlCan_GetCmdh }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor }, #endif // wxLUA_USE_wxPointSizeRect *************** *** 480,483 **** --- 497,501 ---- int s_wxluatag_wxlLuaCanCmd = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) *************** *** 499,502 **** --- 517,521 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) *************** *** 528,534 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, {0} }, }; --- 547,553 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, ! { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, s_wxluaargArray_None }, }; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluacan_bind.cpp 14 Dec 2006 01:01:22 -0000 1.11 --- wxluacan_bind.cpp 17 Dec 2006 07:47:14 -0000 1.12 *************** *** 94,97 **** --- 94,98 ---- + static wxLuaArgTag s_wxluatagArray_wxLua_function_GetCan[] = { 0 }; // %function wxlCan* GetCan() static int LUACALL wxLua_function_GetCan(lua_State *L) *************** *** 107,110 **** --- 108,112 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_function_GetCmdhMain[] = { 0 }; // %function wxlLuaCanCmd* GetCmdhMain() static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) *************** *** 130,136 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, { 0 } }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, { 0 } }, ! { LuaGlobal, 0, 0, 0, 0, {0} }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 132,138 ---- static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluatagArray_wxLua_function_GetCan }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluatagArray_wxLua_function_GetCmdhMain }, ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluacan.h 14 Dec 2006 01:01:22 -0000 1.18 --- wxluacan.h 17 Dec 2006 07:47:14 -0000 1.19 *************** *** 14,20 **** #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 3 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 3 // binding class --- 14,20 ---- #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 4 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 4 // binding class |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** wxbind.h 14 Dec 2006 01:01:23 -0000 1.47 --- wxbind.h 17 Dec 2006 07:47:14 -0000 1.48 *************** *** 39,45 **** #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 3 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 3 // binding class --- 39,45 ---- #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 4 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 4 // binding class |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** xml.cpp 14 Dec 2006 01:01:26 -0000 1.16 --- xml.cpp 17 Dec 2006 07:47:16 -0000 1.17 *************** *** 35,38 **** --- 35,39 ---- int s_wxluatag_wxXmlNode = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNodeDefault_constructor[] = { 0 }; // %constructor wxXmlNodeDefault() static int LUACALL wxLua_wxXmlNodeDefault_constructor(lua_State *L) *************** *** 50,53 **** --- 51,55 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_constructor[] = { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) *************** *** 73,76 **** --- 75,79 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor[] = { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 }; // %constructor wxXmlNodeEntry(wxXmlNode *parent, wxXmlNodeType type, const wxString& name, const wxString& content, wxXmlProperty *props, wxXmlNode *next); static int LUACALL wxLua_wxXmlNodeEntry_constructor(lua_State *L) *************** *** 100,103 **** --- 103,107 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 }; // void AddChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L) *************** *** 114,117 **** --- 118,122 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_InsertChild[] = { &s_wxluatag_wxXmlNode, &s_wxluatag_wxXmlNode, 0 }; // void InsertChild(wxXmlNode *child, wxXmlNode *before_node); static int LUACALL wxLua_wxXmlNode_InsertChild(lua_State *L) *************** *** 130,133 **** --- 135,139 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_RemoveChild[] = { &s_wxluatag_wxXmlNode, 0 }; // bool RemoveChild(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L) *************** *** 147,150 **** --- 153,157 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddProperty[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // void AddProperty(const wxString& name, const wxString& value); static int LUACALL wxLua_wxXmlNode_AddProperty(lua_State *L) *************** *** 163,166 **** --- 170,174 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty[] = { &s_wxluaarg_String, 0 }; // bool DeleteProperty(const wxString& name); static int LUACALL wxLua_wxXmlNode_DeleteProperty(lua_State *L) *************** *** 180,183 **** --- 188,192 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetType[] = { 0 }; // wxXmlNodeType GetType() const; static int LUACALL wxLua_wxXmlNode_GetType(lua_State *L) *************** *** 195,198 **** --- 204,208 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetName[] = { 0 }; // wxString GetName() const; static int LUACALL wxLua_wxXmlNode_GetName(lua_State *L) *************** *** 210,213 **** --- 220,224 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetContent[] = { 0 }; // wxString GetContent() const; static int LUACALL wxLua_wxXmlNode_GetContent(lua_State *L) *************** *** 225,228 **** --- 236,240 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetParent[] = { 0 }; // wxXmlNode *GetParent() const; static int LUACALL wxLua_wxXmlNode_GetParent(lua_State *L) *************** *** 240,243 **** --- 252,256 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetNext[] = { 0 }; // wxXmlNode *GetNext() const; static int LUACALL wxLua_wxXmlNode_GetNext(lua_State *L) *************** *** 255,258 **** --- 268,272 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetChildren[] = { 0 }; // wxXmlNode *GetChildren() const; static int LUACALL wxLua_wxXmlNode_GetChildren(lua_State *L) *************** *** 270,273 **** --- 284,288 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetProperties[] = { 0 }; // wxXmlProperty *GetProperties() const; static int LUACALL wxLua_wxXmlNode_GetProperties(lua_State *L) *************** *** 285,288 **** --- 300,304 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // %override wxLua_wxXmlNode_GetPropValPtr // %rename GetPropValPtr bool GetPropVal(const wxString& propName, wxString *value) const; *************** *** 307,310 **** --- 323,327 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_GetPropVal[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // wxString GetPropVal(const wxString& propName, const wxString& defaultVal) const; static int LUACALL wxLua_wxXmlNode_GetPropVal(lua_State *L) *************** *** 326,329 **** --- 343,347 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_HasProp[] = { &s_wxluaarg_String, 0 }; // bool HasProp(const wxString& propName) const; static int LUACALL wxLua_wxXmlNode_HasProp(lua_State *L) *************** *** 343,346 **** --- 361,365 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetType[] = { &s_wxluaarg_Enumeration, 0 }; // void SetType(wxXmlNodeType type); static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L) *************** *** 357,360 **** --- 376,380 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetName[] = { &s_wxluaarg_String, 0 }; // void SetName(const wxString& name); static int LUACALL wxLua_wxXmlNode_SetName(lua_State *L) *************** *** 371,374 **** --- 391,395 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetContent[] = { &s_wxluaarg_String, 0 }; // void SetContent(const wxString& con); static int LUACALL wxLua_wxXmlNode_SetContent(lua_State *L) *************** *** 385,388 **** --- 406,410 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetParent[] = { &s_wxluatag_wxXmlNode, 0 }; // void SetParent(wxXmlNode *parent); static int LUACALL wxLua_wxXmlNode_SetParent(lua_State *L) *************** *** 399,402 **** --- 421,425 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetNext[] = { &s_wxluatag_wxXmlNode, 0 }; // void SetNext(wxXmlNode *next); static int LUACALL wxLua_wxXmlNode_SetNext(lua_State *L) *************** *** 413,416 **** --- 436,440 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetChildren[] = { &s_wxluatag_wxXmlNode, 0 }; // void SetChildren(wxXmlNode *child); static int LUACALL wxLua_wxXmlNode_SetChildren(lua_State *L) *************** *** 427,430 **** --- 451,455 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetProperties[] = { &s_wxluatag_wxXmlProperty, 0 }; // void SetProperties(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_SetProperties(lua_State *L) *************** *** 441,444 **** --- 466,470 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddPropertyEntry[] = { &s_wxluatag_wxXmlProperty, 0 }; // %rename AddPropertyEntry void AddProperty(wxXmlProperty *prop); static int LUACALL wxLua_wxXmlNode_AddPropertyEntry(lua_State *L) *************** *** 486,531 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlNode_methods[] = { ! { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, { 0 } }, ! { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "InsertChild", wxLua_wxXmlNode_InsertChild, 2, 2, { &s_wxluatag_wxXmlNode, &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "RemoveChild", wxLua_wxXmlNode_RemoveChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "AddProperty", wxLua_wxXmlNode_AddProperty, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "DeleteProperty", wxLua_wxXmlNode_DeleteProperty, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetType", wxLua_wxXmlNode_GetType, 0, 0, { 0 } }, ! { LuaMethod, "GetName", wxLua_wxXmlNode_GetName, 0, 0, { 0 } }, ! { LuaMethod, "GetContent", wxLua_wxXmlNode_GetContent, 0, 0, { 0 } }, ! { LuaMethod, "GetParent", wxLua_wxXmlNode_GetParent, 0, 0, { 0 } }, ! { LuaMethod, "GetNext", wxLua_wxXmlNode_GetNext, 0, 0, { 0 } }, ! { LuaMethod, "GetChildren", wxLua_wxXmlNode_GetChildren, 0, 0, { 0 } }, ! { LuaMethod, "GetProperties", wxLua_wxXmlNode_GetProperties, 0, 0, { 0 } }, ! { LuaMethod, "GetPropValPtr", wxLua_wxXmlNode_GetPropValPtr, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetPropVal", wxLua_wxXmlNode_GetPropVal, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, ! { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, ! { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, {0} }, ! { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, {0} }, ! { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, {0} }, ! { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, {0} }, ! { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, {0} }, ! { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, {0} }, ! { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, {0} }, ! { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, {0} }, ! { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, {0} }, ! { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, {0} }, ! { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, {0} }, ! { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, {0} }, ! { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, {0} }, ! { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, {0} }, ! { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, {0} }, }; --- 512,557 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlNode_methods[] = { ! { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlNodeDefault_constructor }, ! { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, s_wxluatagArray_wxLua_wxXmlNode_constructor }, ! { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, s_wxluatagArray_wxLua_wxXmlNodeEntry_constructor }, ! { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }, ! { LuaMethod, "InsertChild", wxLua_wxXmlNode_InsertChild, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_InsertChild }, ! { LuaMethod, "RemoveChild", wxLua_wxXmlNode_RemoveChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_RemoveChild }, ! { LuaMethod, "AddProperty", wxLua_wxXmlNode_AddProperty, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_AddProperty }, ! { LuaMethod, "DeleteProperty", wxLua_wxXmlNode_DeleteProperty, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_DeleteProperty }, ! { LuaMethod, "GetType", wxLua_wxXmlNode_GetType, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetType }, ! { LuaMethod, "GetName", wxLua_wxXmlNode_GetName, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetName }, ! { LuaMethod, "GetContent", wxLua_wxXmlNode_GetContent, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetContent }, ! { LuaMethod, "GetParent", wxLua_wxXmlNode_GetParent, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetParent }, ! { LuaMethod, "GetNext", wxLua_wxXmlNode_GetNext, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetNext }, ! { LuaMethod, "GetChildren", wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetChildren }, ! { LuaMethod, "GetProperties", wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluatagArray_wxLua_wxXmlNode_GetProperties }, ! { LuaMethod, "GetPropValPtr", wxLua_wxXmlNode_GetPropValPtr, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropValPtr }, ! { LuaMethod, "GetPropVal", wxLua_wxXmlNode_GetPropVal, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_GetPropVal }, ! { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_HasProp }, ! { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetType }, ! { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetName }, ! { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetContent }, ! { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetParent }, ! { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetNext }, ! { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetChildren }, ! { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_SetProperties }, ! { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddPropertyEntry }, ! { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, s_wxluaargArray_None }, ! { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 542,545 **** --- 568,572 ---- int s_wxluatag_wxXmlProperty = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, 0 }; // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) *************** *** 563,566 **** --- 590,594 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlPropertyDefault_constructor[] = { 0 }; // %constructor wxXmlPropertyDefault() static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) *************** *** 578,581 **** --- 606,610 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetName[] = { 0 }; // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) *************** *** 593,596 **** --- 622,626 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetValue[] = { 0 }; // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) *************** *** 608,611 **** --- 638,642 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_GetNext[] = { 0 }; // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) *************** *** 623,626 **** --- 654,658 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_SetName[] = { &s_wxluaarg_String, 0 }; // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) *************** *** 637,640 **** --- 669,673 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_SetValue[] = { &s_wxluaarg_String, 0 }; // void SetValue(const wxString& value) static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) *************** *** 651,654 **** --- 684,688 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlProperty_SetNext[] = { &s_wxluatag_wxXmlProperty, 0 }; // void SetNext(wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) *************** *** 696,715 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlProperty_methods[] = { ! { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, 0 } }, ! { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, { 0 } }, ! { LuaMethod, "GetName", wxLua_wxXmlProperty_GetName, 0, 0, { 0 } }, ! { LuaMethod, "GetValue", wxLua_wxXmlProperty_GetValue, 0, 0, { 0 } }, ! { LuaMethod, "GetNext", wxLua_wxXmlProperty_GetNext, 0, 0, { 0 } }, ! { LuaMethod, "SetName", wxLua_wxXmlProperty_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetValue", wxLua_wxXmlProperty_SetValue, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetNext", wxLua_wxXmlProperty_SetNext, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, ! { LuaGetProp, "Name", wxLua_wxXmlProperty_GetName, 0, 0, {0} }, ! { LuaSetProp, "Name", wxLua_wxXmlProperty_SetName, 1, 1, {0} }, ! { LuaGetProp, "Value", wxLua_wxXmlProperty_GetValue, 0, 0, {0} }, ! { LuaSetProp, "Value", wxLua_wxXmlProperty_SetValue, 1, 1, {0} }, ! { LuaGetProp, "Next", wxLua_wxXmlProperty_GetNext, 0, 0, {0} }, ! { LuaSetProp, "Next", wxLua_wxXmlProperty_SetNext, 1, 1, {0} }, ! { LuaDelete, "wxXmlProperty", wxLua_wxXmlProperty_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxXmlProperty_Delete, 0, 0, {0} }, }; --- 730,749 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlProperty_methods[] = { ! { LuaConstructor, "wxXmlProperty", wxLua_wxXmlProperty_constructor, 3, 3, s_wxluatagArray_wxLua_wxXmlProperty_constructor }, ! { LuaConstructor, "wxXmlPropertyDefault", wxLua_wxXmlPropertyDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlPropertyDefault_constructor }, ! { LuaMethod, "GetName", wxLua_wxXmlProperty_GetName, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetName }, ! { LuaMethod, "GetValue", wxLua_wxXmlProperty_GetValue, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetValue }, ! { LuaMethod, "GetNext", wxLua_wxXmlProperty_GetNext, 0, 0, s_wxluatagArray_wxLua_wxXmlProperty_GetNext }, ! { LuaMethod, "SetName", wxLua_wxXmlProperty_SetName, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetName }, ! { LuaMethod, "SetValue", wxLua_wxXmlProperty_SetValue, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetValue }, ! { LuaMethod, "SetNext", wxLua_wxXmlProperty_SetNext, 1, 1, s_wxluatagArray_wxLua_wxXmlProperty_SetNext }, ! { LuaGetProp, "Name", wxLua_wxXmlProperty_GetName, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Name", wxLua_wxXmlProperty_SetName, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Value", wxLua_wxXmlProperty_GetValue, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Value", wxLua_wxXmlProperty_SetValue, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Next", wxLua_wxXmlProperty_GetNext, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Next", wxLua_wxXmlProperty_SetNext, 1, 1, s_wxluaargArray_None }, ! { LuaDelete, "wxXmlProperty", wxLua_wxXmlProperty_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxXmlProperty_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 726,729 **** --- 760,764 ---- int s_wxluatag_wxXmlDocument = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocumentDefault_constructor[] = { 0 }; // %constructor wxXmlDocumentDefault(); static int LUACALL wxLua_wxXmlDocumentDefault_constructor(lua_State *L) *************** *** 741,744 **** --- 776,780 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // wxXmlDocument(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_constructor(lua_State *L) *************** *** 762,765 **** --- 798,802 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_Load[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // bool Load(const wxString& filename, const wxString& encoding = "UTF-8"); static int LUACALL wxLua_wxXmlDocument_Load(lua_State *L) *************** *** 783,786 **** --- 820,824 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_Save[] = { &s_wxluaarg_String, 0 }; // bool Save(const wxString& filename) const; static int LUACALL wxLua_wxXmlDocument_Save(lua_State *L) *************** *** 800,803 **** --- 838,842 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_IsOk[] = { 0 }; // bool IsOk() const; static int LUACALL wxLua_wxXmlDocument_IsOk(lua_State *L) *************** *** 815,818 **** --- 854,858 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetRoot[] = { 0 }; // wxXmlNode *GetRoot() const; static int LUACALL wxLua_wxXmlDocument_GetRoot(lua_State *L) *************** *** 830,833 **** --- 870,874 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetVersion[] = { 0 }; // wxString GetVersion() const; static int LUACALL wxLua_wxXmlDocument_GetVersion(lua_State *L) *************** *** 845,848 **** --- 886,890 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding[] = { 0 }; // wxString GetFileEncoding() const; static int LUACALL wxLua_wxXmlDocument_GetFileEncoding(lua_State *L) *************** *** 860,863 **** --- 902,906 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_SetRoot[] = { &s_wxluatag_wxXmlNode, 0 }; // void SetRoot(wxXmlNode *node); static int LUACALL wxLua_wxXmlDocument_SetRoot(lua_State *L) *************** *** 874,877 **** --- 917,921 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_SetVersion[] = { &s_wxluaarg_String, 0 }; // void SetVersion(const wxString& version); static int LUACALL wxLua_wxXmlDocument_SetVersion(lua_State *L) *************** *** 888,891 **** --- 932,936 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlDocument_SetFileEncoding[] = { &s_wxluaarg_String, 0 }; // void SetFileEncoding(const wxString& encoding); static int LUACALL wxLua_wxXmlDocument_SetFileEncoding(lua_State *L) *************** *** 933,955 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlDocument_methods[] = { ! { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, { 0 } }, ! { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Load", wxLua_wxXmlDocument_Load, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Save", wxLua_wxXmlDocument_Save, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, { 0 } }, ! { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, { 0 } }, ! { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, { 0 } }, ! { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, { 0 } }, ! { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, ! { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, {0} }, ! { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, {0} }, ! { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, {0} }, ! { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, {0} }, ! { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, {0} }, ! { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, {0} }, ! { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, {0} }, }; --- 978,1000 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlDocument_methods[] = { ! { LuaConstructor, "wxXmlDocumentDefault", wxLua_wxXmlDocumentDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlDocumentDefault_constructor }, ! { LuaConstructor, "wxXmlDocument", wxLua_wxXmlDocument_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_constructor }, ! { LuaMethod, "Load", wxLua_wxXmlDocument_Load, 2, 1, s_wxluatagArray_wxLua_wxXmlDocument_Load }, ! { LuaMethod, "Save", wxLua_wxXmlDocument_Save, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_Save }, ! { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_IsOk }, ! { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetRoot }, ! { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetVersion }, ! { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, s_wxluatagArray_wxLua_wxXmlDocument_GetFileEncoding }, ! { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetRoot }, ! { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetVersion }, ! { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, s_wxluatagArray_wxLua_wxXmlDocument_SetFileEncoding }, ! { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, s_wxluaargArray_None }, ! { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 977,981 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlResourceHandler_methods[] = { ! { LuaDelete, "wxXmlResourceHandler", wxLua_wxXmlResourceHandler_destructor, 0, 0, {0} }, }; --- 1022,1026 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlResourceHandler_methods[] = { ! { LuaDelete, "wxXmlResourceHandler", wxLua_wxXmlResourceHandler_destructor, 0, 0, s_wxluaargArray_None }, }; *************** *** 994,997 **** --- 1039,1043 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap[] = { &s_wxluaarg_String, 0 }; // wxBitmap LoadBitmap(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadBitmap(lua_State *L) *************** *** 1018,1021 **** --- 1064,1068 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxDialog* LoadDialog(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadDialog(lua_State *L) *************** *** 1037,1040 **** --- 1084,1088 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate[] = { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // %rename LoadDialogCreate bool LoadDialog(wxDialog* dlg, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadDialogCreate(lua_State *L) *************** *** 1058,1061 **** --- 1106,1110 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_CreateDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // %override wxLua_wxXmlResource_CreateDialog // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) *************** *** 1087,1090 **** --- 1136,1140 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadFrame[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // bool LoadFrame(wxFrame* frame, wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadFrame(lua_State *L) *************** *** 1108,1111 **** --- 1158,1162 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_CreateFrame[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // %override wxLua_wxXmlResource_CreateFrame // wxFrame* CreateFrame(wxWindow* parent, const wxString& name) *************** *** 1137,1140 **** --- 1188,1192 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadIcon[] = { &s_wxluaarg_String, 0 }; // wxIcon LoadIcon(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadIcon(lua_State *L) *************** *** 1161,1164 **** --- 1213,1217 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenu[] = { &s_wxluaarg_String, 0 }; // wxMenu* LoadMenu(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenu(lua_State *L) *************** *** 1178,1181 **** --- 1231,1235 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // %rename LoadMenuBarWindow wxMenuBar* LoadMenuBar(wxWindow* parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBarWindow(lua_State *L) *************** *** 1197,1200 **** --- 1251,1255 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar[] = { &s_wxluaarg_String, 0 }; // wxMenuBar* LoadMenuBar(const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadMenuBar(lua_State *L) *************** *** 1218,1221 **** --- 1273,1277 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxToolBar* LoadToolBar(wxWindow *parent, const wxString& name); static int LUACALL wxLua_wxXmlResource_LoadToolBar(lua_State *L) *************** *** 1239,1242 **** --- 1295,1299 ---- #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResource_constructor(lua_State *L) *************** *** 1260,1263 **** --- 1317,1321 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResourceGetDefault_constructor[] = { 0 }; // %override wxLua_wxXmlResourceGetDefault_constructor // %constructor wxXmlResourceGetDefault() *************** *** 1274,1277 **** --- 1332,1336 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResourceDefault_constructor[] = { &s_wxluaarg_Number, 0 }; // %constructor wxXmlResourceDefault(int flags = wxXRC_USE_LOCALE); static int LUACALL wxLua_wxXmlResourceDefault_constructor(lua_State *L) *************** *** 1293,1296 **** --- 1352,1356 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl[] = { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 }; // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) *************** *** 1316,1319 **** --- 1376,1380 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers[] = { 0 }; // void ClearHandlers(); static int LUACALL wxLua_wxXmlResource_ClearHandlers(lua_State *L) *************** *** 1328,1331 **** --- 1389,1393 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_CompareVersion[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // int CompareVersion(int major, int minor, int release, int revision) const; static int LUACALL wxLua_wxXmlResource_CompareVersion(lua_State *L) *************** *** 1351,1354 **** --- 1413,1417 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Get[] = { 0 }; // %override wxLua_wxXmlResource_Get // wxXmlResource* Get() *************** *** 1365,1368 **** --- 1428,1432 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetFlags[] = { 0 }; // int GetFlags() static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) *************** *** 1380,1383 **** --- 1444,1448 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetVersion[] = { 0 }; // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) *************** *** 1395,1398 **** --- 1460,1464 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_GetXRCID[] = { &s_wxluaarg_String, 0 }; // %override wxLua_wxXmlResource_GetXRCID // int GetXRCID(const wxString &stringID) *************** *** 1411,1414 **** --- 1477,1481 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers[] = { 0 }; // void InitAllHandlers(); static int LUACALL wxLua_wxXmlResource_InitAllHandlers(lua_State *L) *************** *** 1423,1426 **** --- 1490,1494 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Load[] = { &s_wxluaarg_String, 0 }; // bool Load(const wxString& filemask); static int LUACALL wxLua_wxXmlResource_Load(lua_State *L) *************** *** 1440,1443 **** --- 1508,1512 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanel[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // wxPanel* LoadPanel(wxWindow* parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanel(lua_State *L) *************** *** 1459,1462 **** --- 1528,1532 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_LoadPanelCreate[] = { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 }; // %rename LoadPanelCreate bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString &name); static int LUACALL wxLua_wxXmlResource_LoadPanelCreate(lua_State *L) *************** *** 1480,1483 **** --- 1550,1554 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Set[] = { &s_wxluatag_wxXmlResource, 0 }; // %override wxLua_wxXmlResource_Set // wxXmlResource* Set(wxXmlResource *res) *************** *** 1496,1499 **** --- 1567,1571 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_SetFlags[] = { &s_wxluaarg_Number, 0 }; // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) *************** *** 1510,1513 **** --- 1582,1586 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlResource_Unload[] = { &s_wxluaarg_String, 0 }; // bool Unload(const wxString& filename) static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) *************** *** 1560,1617 **** #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) ! { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, { &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) ! { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) ! { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) ! { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, { &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) ! { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, { &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) ! { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) ! { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, { 0 } }, ! { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 } }, ! { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, { 0 } }, ! { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, { 0 } }, ! { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, { 0 } }, ! { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, { 0 } }, ! { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, { 0 } }, ! { LuaMethod, "Load", wxLua_wxXmlResource_Load, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "LoadPanel", wxLua_wxXmlResource_LoadPanel, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, { &s_wxluatag_wxXmlResource, 0 } }, ! { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Unload", wxLua_wxXmlResource_Unload, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, {0} }, ! { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, {0} }, ! { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, {0} }, }; --- 1633,1690 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) ! { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadBitmap }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) ! { LuaMethod, "LoadDialog", wxLua_wxXmlResource_LoadDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadDialog }, ! { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadDialogCreate }, ! { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateDialog }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) ! { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadFrame }, ! { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_CreateFrame }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) ! { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadIcon }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) ! { LuaMethod, "LoadMenu", wxLua_wxXmlResource_LoadMenu, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenu }, ! { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBarWindow }, ! { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_LoadMenuBar }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) ! { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadToolBar }, #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) ! { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, s_wxluatagArray_wxLua_wxXmlResource_constructor }, ! { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, s_wxluatagArray_wxLua_wxXmlResourceGetDefault_constructor }, ! { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, s_wxluatagArray_wxLua_wxXmlResourceDefault_constructor }, ! { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, s_wxluatagArray_wxLua_wxXmlResource_AttachUnknownControl }, ! { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_ClearHandlers }, ! { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, s_wxluatagArray_wxLua_wxXmlResource_CompareVersion }, ! { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_Get }, ! { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_GetFlags }, ! { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_GetVersion }, ! { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_GetXRCID }, ! { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, s_wxluatagArray_wxLua_wxXmlResource_InitAllHandlers }, ! { LuaMethod, "Load", wxLua_wxXmlResource_Load, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Load }, ! { LuaMethod, "LoadPanel", wxLua_wxXmlResource_LoadPanel, 2, 2, s_wxluatagArray_wxLua_wxXmlResource_LoadPanel }, ! { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, s_wxluatagArray_wxLua_wxXmlResource_LoadPanelCreate }, ! { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Set }, ! { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_SetFlags }, ! { LuaMethod, "Unload", wxLua_wxXmlResource_Unload, 1, 1, s_wxluatagArray_wxLua_wxXmlResource_Unload }, ! { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, s_wxluaargArray_None }, ! { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, s_wxluaargArray_None }, }; Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** defsutil.cpp 14 Dec 2006 01:01:23 -0000 1.20 --- defsutil.cpp 17 Dec 2006 07:47:15 -0000 1.21 *************** *** 37,40 **** --- 37,41 ---- #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetErrorStream[] = { 0 }; // wxInputStream *GetErrorStream() const static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) *************** *** 52,55 **** --- 53,57 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetInputStream[] = { 0 }; // wxInputStream *GetInputStream() const static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) *************** *** 67,70 **** --- 69,73 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetOutputStream[] = { 0 }; // wxOutputStream *GetOutputStream() const static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) *************** *** 82,85 **** --- 85,89 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 }; // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) *************** *** 104,107 **** --- 108,112 ---- #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_CloseOutput[] = { 0 }; // void CloseOutput() static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) *************** *** 116,119 **** --- 121,125 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable[] = { 0 }; // bool IsErrorAvailable() const static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) *************** *** 131,134 **** --- 137,141 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputAvailable[] = { 0 }; // bool IsInputAvailable() const static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) *************** *** 146,149 **** --- 153,157 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputOpened[] = { 0 }; // bool IsInputOpened() const static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) *************** *** 163,166 **** --- 171,175 ---- #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 }; // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) *************** *** 184,187 **** --- 193,197 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Detach[] = { 0 }; // void Detach() static int LUACALL wxLua_wxProcess_Detach(lua_State *L) *************** *** 196,199 **** --- 206,210 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 }; // static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN) static int LUACALL wxLua_wxProcess_Kill(lua_State *L) *************** *** 217,220 **** --- 228,232 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Exists[] = { &s_wxluaarg_Number, 0 }; // static bool Exists(int pid) static int LUACALL wxLua_wxProcess_Exists(lua_State *L) *************** *** 232,235 **** --- 244,248 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Open[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC) static int LUACALL wxLua_wxProcess_Open(lua_State *L) *************** *** 251,254 **** --- 264,268 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Redirect[] = { 0 }; // void Redirect() static int LUACALL wxLua_wxProcess_Redirect(lua_State *L) *************** *** 263,266 **** --- 277,281 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsRedirected[] = { 0 }; // bool IsRedirected() static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L) *************** *** 311,337 **** #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, { 0 } }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, { 0 } }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, ! { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, { 0 } }, ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, { 0 } }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, { 0 } }, ! { LuaMethod, "Kill", wxLua_wxProcess_Kill, 3, 1, { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Exists", wxLua_wxProcess_Exists, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, { 0 } }, ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, { 0 } }, ! { LuaDelete, "wxProcess", wxLua_wxProcess_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, {0} }, }; --- 326,352 ---- #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) ! { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }, ! { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetInputStream }, ! { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }, ! { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }, #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, s_wxluatagArray_wxLua_wxProcess_CloseOutput }, ! { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }, ! { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }, ! { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }, #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) ! { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, s_wxluatagArray_wxLua_wxProcess_constructor }, ! { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, s_wxluatagArray_wxLua_wxProcess_Detach }, ! { LuaMethod, "Kill", wxLua_wxProcess_Kill, 3, 1, s_wxluatagArray_wxLua_wxProcess_Kill }, ! { LuaMethod, "Exists", wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }, ! { LuaMethod, "Open", wxLua_wxProcess_Open, 2, 1, s_wxluatagArray_wxLua_wxProcess_Open }, ! { LuaMethod, "Redirect", wxLua_wxProcess_Redirect, 0, 0, s_wxluatagArray_wxLua_wxProcess_Redirect }, ! { LuaMethod, "IsRedirected", wxLua_wxProcess_IsRedirected, 0, 0, s_wxluatagArray_wxLua_wxProcess_IsRedirected }, ! { LuaDelete, "wxProcess", wxLua_wxProcess_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 348,351 **** --- 363,367 ---- int s_wxluatag_wxMouseState = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_constructor[] = { 0 }; // wxMouseState() static int LUACALL wxLua_wxMouseState_constructor(lua_State *L) *************** *** 363,366 **** --- 379,383 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetX[] = { 0 }; // wxCoord GetX() static int LUACALL wxLua_wxMouseState_GetX(lua_State *L) *************** *** 378,381 **** --- 395,399 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetY[] = { 0 }; // wxCoord GetY() static int LUACALL wxLua_wxMouseState_GetY(lua_State *L) *************** *** 393,396 **** --- 411,415 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_LeftDown[] = { 0 }; // bool LeftDown() static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L) *************** *** 408,411 **** --- 427,431 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MiddleDown[] = { 0 }; // bool MiddleDown() static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L) *************** *** 423,426 **** --- 443,447 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_RightDown[] = { 0 }; // bool RightDown() static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L) *************** *** 438,441 **** --- 459,463 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ControlDown[] = { 0 }; // bool ControlDown() static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L) *************** *** 453,456 **** --- 475,479 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ShiftDown[] = { 0 }; // bool ShiftDown() static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L) *************** *** 468,471 **** --- 491,495 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_AltDown[] = { 0 }; // bool AltDown() static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L) *************** *** 483,486 **** --- 507,511 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MetaDown[] = { 0 }; // bool MetaDown() static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L) *************** *** 498,501 **** --- 523,527 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_CmdDown[] = { 0 }; // bool CmdDown() static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L) *************** *** 513,516 **** --- 539,543 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluaarg_Number, 0 }; // void SetX(wxCoord x) static int LUACALL wxLua_wxMouseState_SetX(lua_State *L) *************** *** 527,530 **** --- 554,558 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluaarg_Number, 0 }; // void SetY(wxCoord y) static int LUACALL wxLua_wxMouseState_SetY(lua_State *L) *************** *** 541,544 **** --- 569,573 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetLeftDown(bool down) static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L) *************** *** 555,558 **** --- 584,588 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetMiddleDown(bool down) static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L) *************** *** 569,572 **** --- 599,603 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetRightDown(bool down) static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L) *************** *** 583,586 **** --- 614,618 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetControlDown(bool down) static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L) *************** *** 597,600 **** --- 629,633 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetShiftDown(bool down) static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L) *************** *** 611,614 **** --- 644,648 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetAltDown(bool down) static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L) *************** *** 625,628 **** --- 659,663 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluaarg_Boolean, 0 }; // void SetMetaDown(bool down) static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L) *************** *** 670,695 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { ! { LuaConstructor, "wxMouseState", wxLua_wxMouseState_constructor, 0, 0, { 0 } }, ! { LuaMethod, "GetX", wxLua_wxMouseState_GetX, 0, 0, { 0 } }, ! { LuaMethod, "GetY", wxLua_wxMouseState_GetY, 0, 0, { 0 } }, ! { LuaMethod, "LeftDown", wxLua_wxMouseState_LeftDown, 0, 0, { 0 } }, ! { LuaMethod, "MiddleDown", wxLua_wxMouseState_MiddleDown, 0, 0, { 0 } }, ! { LuaMethod, "RightDown", wxLua_wxMouseState_RightDown, 0, 0, { 0 } }, ! { LuaMethod, "ControlD... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxldefs.h 14 Dec 2006 01:01:26 -0000 1.11 --- wxldefs.h 17 Dec 2006 07:47:17 -0000 1.12 *************** *** 49,53 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 3 // ---------------------------------------------------------------------------- --- 49,53 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 4 // ---------------------------------------------------------------------------- Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxlbind.h 14 Dec 2006 01:01:26 -0000 1.31 --- wxlbind.h 17 Dec 2006 07:47:17 -0000 1.32 *************** *** 52,55 **** --- 52,56 ---- typedef int* wxLuaArgTag; // address of class tag (a pointer to it) + extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0} struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property *************** *** 60,64 **** int maxargs; // max number of function arguments (was 'params') int minargs; // min number of function arguments (was 'required') ! wxLuaArgTag argtags[20]; // array of lua tags representing each argument, zero terminated }; --- 61,65 ---- int maxargs; // max number of function arguments (was 'params') int minargs; // min number of function arguments (was 'required') ! wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated }; |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:22
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluasocket_bind.h 14 Dec 2006 01:01:27 -0000 1.10 --- wxluasocket_bind.h 17 Dec 2006 07:47:17 -0000 1.11 *************** *** 23,29 **** #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 3 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 3 // binding class --- 23,29 ---- #include "wxlua/include/wxlbind.h" ! #if WXLUA_BINDING_VERSION > 4 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 4 // binding class |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluasocket_bind.cpp 14 Dec 2006 01:01:27 -0000 1.11 --- wxluasocket_bind.cpp 17 Dec 2006 07:47:17 -0000 1.12 *************** *** 112,116 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, {0} }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 112,116 ---- static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluasocket.cpp 14 Dec 2006 01:01:27 -0000 1.11 --- wxluasocket.cpp 17 Dec 2006 07:47:17 -0000 1.12 *************** *** 27,30 **** --- 27,31 ---- int s_wxluatag_wxLuaDebuggerServer = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) *************** *** 44,47 **** --- 45,49 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { 0 }; // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) *************** *** 59,62 **** --- 61,65 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { 0 }; // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) *************** *** 74,77 **** --- 77,81 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { 0 }; // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) *************** *** 89,92 **** --- 93,97 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) *************** *** 108,111 **** --- 113,117 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) *************** *** 127,130 **** --- 133,137 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { 0 }; // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) *************** *** 142,145 **** --- 149,153 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) *************** *** 161,164 **** --- 169,173 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { 0 }; // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) *************** *** 176,179 **** --- 185,189 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { 0 }; // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) *************** *** 191,194 **** --- 201,205 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { 0 }; // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) *************** *** 206,209 **** --- 217,221 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { 0 }; // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) *************** *** 221,224 **** --- 233,237 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { 0 }; // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) *************** *** 236,239 **** --- 249,253 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { 0 }; // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) *************** *** 251,254 **** --- 265,269 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) *************** *** 270,273 **** --- 285,289 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) *************** *** 288,291 **** --- 304,308 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { 0 }; // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) *************** *** 303,306 **** --- 320,324 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { 0 }; // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) *************** *** 318,321 **** --- 336,340 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName[] = { 0 }; // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) *************** *** 331,334 **** --- 350,354 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName[] = { 0 }; // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) *************** *** 375,400 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, { 0 } }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, { 0 } }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, { 0 } }, ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, { 0 } }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, { 0 } }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, { 0 } }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, { 0 } }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, { 0 } }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, { 0 } }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, { 0 } }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, { 0 } }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, { 0 } }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, { 0 } }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, { 0 } }, ! { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, {0} }, }; --- 395,420 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }, ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName }, ! { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 408,411 **** --- 428,432 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { 0 }; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) *************** *** 423,426 **** --- 444,448 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { 0 }; // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) *************** *** 438,441 **** --- 460,464 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { 0 }; // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) *************** *** 453,456 **** --- 476,480 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { 0 }; // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) *************** *** 499,508 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, { 0 } }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, { 0 } }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, { 0 } }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, { 0 } }, ! { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, {0} }, }; --- 523,532 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }, ! { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, }; |
|
From: John L. <jr...@us...> - 2006-12-17 07:47:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxstc_bind.cpp 14 Dec 2006 01:01:26 -0000 1.16 --- wxstc_bind.cpp 17 Dec 2006 07:47:17 -0000 1.17 *************** *** 1432,1436 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, {0} }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 1432,1436 ---- static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** stc.cpp 14 Dec 2006 01:01:26 -0000 1.19 --- stc.cpp 17 Dec 2006 07:47:17 -0000 1.20 *************** *** 29,32 **** --- 29,33 ---- #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) + static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_GetCaretLineBackground[] = { 0 }; // %wxchkver271 wxColour GetCaretLineBackground(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) *************** *** 47,50 **** --- 48,52 ---- } [...5260 lines suppressed...] ! { LuaSetProp, "X", wxLua_wxStyledTextEvent_SetX, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Y", wxLua_wxStyledTextEvent_GetY, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "DragText", wxLua_wxStyledTextEvent_GetDragText, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "DragText", wxLua_wxStyledTextEvent_SetDragText, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "DragAllowMove", wxLua_wxStyledTextEvent_GetDragAllowMove, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "DragAllowMove", wxLua_wxStyledTextEvent_SetDragAllowMove, 1, 1, s_wxluaargArray_None }, ! { LuaGetProp, "Shift", wxLua_wxStyledTextEvent_GetShift, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "Control", wxLua_wxStyledTextEvent_GetControl, 0, 0, s_wxluaargArray_None }, ! { LuaGetProp, "Alt", wxLua_wxStyledTextEvent_GetAlt, 0, 0, s_wxluaargArray_None }, ! { LuaDelete, "wxStyledTextEvent", wxLua_wxStyledTextEvent_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxStyledTextEvent_Delete, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxDragDrop ! { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult }, ! { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluatagArray_wxLua_wxStyledTextEvent_GetDragResult }, ! { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, s_wxluaargArray_None }, ! { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, s_wxluaargArray_None }, #endif // wxLUA_USE_wxDragDrop |
