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...> - 2005-06-18 20:46:38
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/bin Modified Files: luad.exe Log Message: Updated to wxIDE's wrapper files Index: luad.exe =================================================================== RCS file: /cvsroot/wxlua/wxLua/bin/luad.exe,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs5gwQ9v and /tmp/cvsnmvuGM differ |
|
From: John L. <jr...@us...> - 2005-06-18 20:46:26
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/apps/wxlua/src Modified Files: wxLua_wx26.dsp wxLua_wx26.dsw wxlua.cpp Log Message: Updated to wxIDE's wrapper files Index: wxLua_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxLua_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.2 --- wxLua_wx26.dsp 18 Jun 2005 20:45:46 -0000 1.3 *************** *** 52,57 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" --- 52,57 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxluabind_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxluabind_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" *************** *** 77,82 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows --- 77,82 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxluabindd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxluabindd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.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 odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows *************** *** 90,134 **** # Begin Source File - SOURCE=..\..\..\icons\wxlua.ico - # End Source File - # Begin Source File - - SOURCE=..\..\..\bindings\wxwidgets\override.hpp - # End Source File - # Begin Source File - - SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.i - - !IF "$(CFG)" == "wxLua_wx26 - Win32 Release" - - USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" - # Begin Custom Build - Generating Binding - - "wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Building wrapper file wxLuaWrap.cpp - wrap.bat - - # End Custom Build - - !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" - - USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" - # Begin Custom Build - Generating Binding - - "wxLuaWrap.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - echo Building wrapper file wxLuaWrap.cpp - wrap.bat - - # End Custom Build - - !ENDIF - - # End Source File - # Begin Source File - - SOURCE=.\wxluawrap.cpp - # End Source File - # Begin Source File - SOURCE=.\wxlua.rc # End Source File --- 90,93 ---- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua.cpp 14 Jun 2005 21:44:39 -0000 1.2 --- wxlua.cpp 18 Jun 2005 20:45:46 -0000 1.3 *************** *** 55,59 **** virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); } virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); } ! virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); } virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); } --- 55,59 ---- virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); } virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); } ! //virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); } virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); } *************** *** 352,356 **** --- 352,358 ---- wxSize(500, 250), &li); + wxGetApp().SetStackFrame(pStackFrame); pStackFrame->ShowModal(); + wxGetApp().SetStackFrame(NULL); pStackFrame->Destroy(); #endif Index: wxLua_wx26.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxLua_wx26.dsw 7 Jun 2005 20:18:06 -0000 1.3 --- wxLua_wx26.dsw 18 Jun 2005 20:45:46 -0000 1.4 *************** *** 64,67 **** --- 64,79 ---- ############################################################################### + Project: "wxLuaBindLib_wx26"=..\..\..\modules\wxbind\src\wxluabind_wx26.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "wxLua_wx26"=.\wxLua_wx26.dsp - Package Owner=<4> *************** *** 87,90 **** --- 99,105 ---- Project_Dep_Name wxLuaSocketLib_wx26 End Project Dependency + Begin Project Dependency + Project_Dep_Name wxLuaBindLib_wx26 + End Project Dependency }}} |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i sizer.i socket.i stc.i wave.i windows.i wxlua.i xml.i Log Message: Updated to wxIDE's wrapper files Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wave.i 6 Jun 2005 23:06:07 -0000 1.1 --- wave.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 4,23 **** %if wxLUA_USE_wxWave ! %win %define wxSOUND_SYNC ! %win %define wxSOUND_ASYNC ! %win %define wxSOUND_LOOP - %gtk %skip - %mac %skip %class %delete %noclassinfo wxWave, wxObject - %include "wx/wave.h" wxWave(const wxString& fileName, bool isResource = FALSE) %constructor wxWaveDefault() bool Create(const wxString& fileName, bool isResource = FALSE) bool IsOk() const ! bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass ! %endif wxLUA_USE_wxWave --- 4,26 ---- %if wxLUA_USE_wxWave ! %win %define wxSOUND_SYNC ! %win %define wxSOUND_ASYNC ! %win %define wxSOUND_LOOP ! ! %if %msw&!wxchkver25 ! %include "wx/wave.h" %class %delete %noclassinfo wxWave, wxObject wxWave(const wxString& fileName, bool isResource = FALSE) %constructor wxWaveDefault() bool Create(const wxString& fileName, bool isResource = FALSE) bool IsOk() const ! !%wxchkver25 bool Play(bool async = TRUE, bool looped = FALSE) const ! %wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const %endclass + %endif ! // FIXME add wxSound for >2.5 + %endif wxLUA_USE_wxWave Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** windows.i 6 Jun 2005 23:06:07 -0000 1.1 --- windows.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 39,44 **** void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! <wxver25 void Clear() ! ~<wxver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const virtual bool Close(bool force = FALSE) --- 39,44 ---- void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! %wxchkver22&!%wxchkver25 void Clear() ! %wxchkver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const virtual bool Close(bool force = FALSE) *************** *** 68,72 **** wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const --- 68,72 ---- wxEvtHandler* GetEventHandler() const long GetExtraStyle() const ! wxFont& GetFont() const virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const *************** *** 90,94 **** wxValidator* GetValidator() const long GetWindowStyleFlag() const ! ~<wxver23 bool HasCapture() const void InitDialog() virtual bool IsEnabled() const --- 90,94 ---- wxValidator* GetValidator() const long GetWindowStyleFlag() const ! %wxchkver24 bool HasCapture() const void InitDialog() virtual bool IsEnabled() const *************** *** 117,121 **** %rename ScreenToClientXY virtual void ScreenToClient(int* x, int* y) const virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) --- 117,121 ---- %rename ScreenToClientXY virtual void ScreenToClient(int* x, int* y) const virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) *************** *** 156,160 **** %property=Validator, read, write void SetToolTip(const wxString& tip) ! wxToolTip* GetToolTip() const %property=ToolTip, read, write void SetWindowStyle(long style) --- 156,160 ---- %property=Validator, read, write void SetToolTip(const wxString& tip) ! wxLUA_USE_wxTooltip wxToolTip* GetToolTip() const %property=ToolTip, read, write void SetWindowStyle(long style) *************** *** 216,224 **** %define wxNB_FIXEDWIDTH ! ~%wxver22 %define wxNB_TOP %define wxNB_LEFT %define wxNB_RIGHT %define wxNB_BOTTOM ! ~%wxver22 %define wxNB_MULTILINE %typedef wxNotebookPage wxWindow --- 216,224 ---- %define wxNB_FIXEDWIDTH ! %wxchkver23 %define wxNB_TOP %define wxNB_LEFT %define wxNB_RIGHT %define wxNB_BOTTOM ! %wxchkver23 %define wxNB_MULTILINE %typedef wxNotebookPage wxWindow *************** *** 277,288 **** %include "wx/tabctrl.h" ! %gtk %skip %class wxTabCtrl, wxControl %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! ~%wxver22 %define wxTC_TOP ! ~%wxver22 %define wxTC_LEFT ! ~%wxver22 %define wxTC_RIGHT ! ~%wxver22 %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW --- 277,288 ---- %include "wx/tabctrl.h" ! %if %msw %class wxTabCtrl, wxControl %define wxTC_RIGHTJUSTIFY %define wxTC_FIXEDWIDTH ! %wxchkver23 %define wxTC_TOP ! %wxchkver23 %define wxTC_LEFT ! %wxchkver23 %define wxTC_RIGHT ! %wxchkver23 %define wxTC_BOTTOM %define wxTC_MULTILINE %define wxTC_OWNERDRAW *************** *** 321,325 **** // wxTabEvent - %gtk %skip %class %delete wxTabEvent, wxCommandEvent %win %define %event wxEVT_COMMAND_TAB_SEL_CHANGED --- 321,324 ---- *************** *** 329,332 **** --- 328,333 ---- %endclass + %endif + %endif wxLUA_USE_wxTabCtrl *************** *** 349,358 **** wxSASH_LEFT wxSASH_NONE ! %end %enum wxSashDragStatus wxSASH_STATUS_OK wxSASH_STATUS_OUT_OF_RANGE ! %end %class wxSashWindow, wxWindow --- 350,359 ---- wxSASH_LEFT wxSASH_NONE ! %endenum %enum wxSashDragStatus wxSASH_STATUS_OK wxSASH_STATUS_OUT_OF_RANGE ! %endenum %class wxSashWindow, wxWindow *************** *** 388,397 **** wxLAYOUT_RIGHT wxLAYOUT_BOTTOM ! %end %enum wxLayoutOrientation wxLAYOUT_HORIZONTAL wxLAYOUT_VERTICAL ! %end %class wxSashLayoutWindow, wxSashWindow --- 389,398 ---- wxLAYOUT_RIGHT wxLAYOUT_BOTTOM ! %endenum %enum wxLayoutOrientation wxLAYOUT_HORIZONTAL wxLAYOUT_VERTICAL ! %endenum %class wxSashLayoutWindow, wxSashWindow *************** *** 520,524 **** %define wxSP_FULLSASH %define wxSP_3D ! ~%wxver22 %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow --- 521,525 ---- %define wxSP_FULLSASH %define wxSP_3D ! %wxchkver23 %define wxSP_SASH_AQUA %class wxSplitterWindow, wxWindow *************** *** 642,644 **** %endif wxLUA_USE_wxStaticLine - --- 643,644 ---- Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** controls.i 6 Jun 2005 23:06:07 -0000 1.1 --- controls.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 19,23 **** %define wxBU_TOP %define wxBU_BOTTOM ! ~%wxver22 %define wxBU_EXACTFIT %class wxButton, wxControl --- 19,23 ---- %define wxBU_TOP %define wxBU_BOTTOM ! %wxchkver23 %define wxBU_EXACTFIT %class wxButton, wxControl *************** *** 72,77 **** void SetValue(const bool state) %property=Value, read, write ! %wxver22 %rename IsChecked bool GetValue() const ! ~%wxver22 bool IsChecked() const %endclass --- 72,77 ---- void SetValue(const bool state) %property=Value, read, write ! %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! %wxchkver23 bool IsChecked() const %endclass *************** *** 256,260 **** %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! ~%wxver22 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST --- 256,260 ---- %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %wxchkver23 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST *************** *** 270,274 **** %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! ~%wxver22 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT --- 270,274 ---- %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %wxchkver23 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT *************** *** 316,322 **** wxListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! SetImageList ! %wxver22 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) ! ~%wxver22 void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") --- 316,322 ---- wxListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! // SetImageList ! %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) ! %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl") *************** *** 402,406 **** wxLIST_FORMAT_CENTRE wxLIST_FORMAT_CENTER ! %end %class %delete wxListItem, wxObject --- 402,406 ---- wxLIST_FORMAT_CENTRE wxLIST_FORMAT_CENTER ! %endenum %class %delete wxListItem, wxObject *************** *** 460,464 **** %define %event wxEVT_COMMAND_LIST_DELETE_ITEM %define %event wxEVT_COMMAND_LIST_END_LABEL_EDIT ! %define %event wxEVT_COMMAND_LIST_GET_INFO %define %event wxEVT_COMMAND_LIST_INSERT_ITEM %define %event wxEVT_COMMAND_LIST_ITEM_ACTIVATED --- 460,464 ---- %define %event wxEVT_COMMAND_LIST_DELETE_ITEM %define %event wxEVT_COMMAND_LIST_END_LABEL_EDIT ! %wxchkver22&!%wxchkver25 %define %event wxEVT_COMMAND_LIST_GET_INFO %define %event wxEVT_COMMAND_LIST_INSERT_ITEM %define %event wxEVT_COMMAND_LIST_ITEM_ACTIVATED *************** *** 468,482 **** %define %event wxEVT_COMMAND_LIST_ITEM_SELECTED %define %event wxEVT_COMMAND_LIST_KEY_DOWN ! %define %event wxEVT_COMMAND_LIST_SET_INFO ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_CACHE_HINT ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_DRAGGING ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_COL_END_DRAG ! ~%wxver22 %define %event wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListEvent(wxEventType commandType = 0, int id = 0) ! %wxver22 %rename GetKeyCode int GetCode() const ! ~%wxver22 int GetKeyCode() const %property=KeyCode, read long GetIndex() const --- 468,482 ---- %define %event wxEVT_COMMAND_LIST_ITEM_SELECTED %define %event wxEVT_COMMAND_LIST_KEY_DOWN ! %wxchkver22&!%wxchkver25 %define %event wxEVT_COMMAND_LIST_SET_INFO ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_CACHE_HINT ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_DRAGGING ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_COL_END_DRAG ! %wxchkver23 %define %event wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListEvent(wxEventType commandType = 0, int id = 0) ! %wxchkver22&!%wxchkver23 %rename GetKeyCode int GetCode() const ! %wxchkver23 int GetKeyCode() const %property=KeyCode, read long GetIndex() const *************** *** 523,530 **** int GetSelection() const wxString GetStringSelection() const ! ~%wxver22 int GetCount() const ! %wxver22 %rename GetCount int Number() const %property=Count, read ! ~%wxver22 %rename SetItemString void SetString(int n, const wxString &label) void SetSelection(int n) %property=Selection, read, write --- 523,530 ---- int GetSelection() const wxString GetStringSelection() const ! %wxchkver23 int GetCount() const ! %wxchkver22&!%wxchkver23 %rename GetCount int Number() const %property=Count, read ! %wxchkver23 %rename SetItemString void SetString(int n, const wxString &label) void SetSelection(int n) %property=Selection, read, write *************** *** 546,550 **** %define wxRB_GROUP ! ~%wxver22 %define wxRB_SINGLE %class wxRadioButton, wxControl --- 546,550 ---- %define wxRB_GROUP ! %wxchkver23 %define wxRB_SINGLE %class wxRadioButton, wxControl *************** *** 719,734 **** %define wxTE_READONLY %define wxTE_RICH ! ~%wxver22 %define wxTE_RICH2 ! ~%wxver22 %define wxTE_AUTO_URL ! ~%wxver22 %define wxTE_NOHIDESEL %define wxHSCROLL ! ~%wxver22 %define wxTE_LEFT ! ~%wxver22 %define wxTE_CENTRE ! ~%wxver22 %define wxTE_RIGHT ! ~%wxver22 %define wxTE_DONTWRAP ! ~%wxver22 %define wxTE_LINEWRAP ! ~%wxver22 %define wxTE_WORDWRAP ! ~%wxver22 %define wxTE_AUTO_SCROLL ! ~%wxver22 %define wxTE_NO_VSCROLL %class wxTextCtrl, wxControl --- 719,734 ---- %define wxTE_READONLY %define wxTE_RICH ! %wxchkver23 %define wxTE_RICH2 ! %wxchkver23 %define wxTE_AUTO_URL ! %wxchkver23 %define wxTE_NOHIDESEL %define wxHSCROLL ! %wxchkver23 %define wxTE_LEFT ! %wxchkver23 %define wxTE_CENTRE ! %wxchkver23 %define wxTE_RIGHT ! %wxchkver23 %define wxTE_DONTWRAP ! %wxchkver23 %define wxTE_LINEWRAP ! %wxchkver23 %define wxTE_WORDWRAP ! %wxchkver23 %define wxTE_AUTO_SCROLL ! %wxchkver23 %define wxTE_NO_VSCROLL %class wxTextCtrl, wxControl *************** *** 783,791 **** %include "wx/treectrl.h" ! ~%wxver22 %define wxTR_NO_BUTTONS %define wxTR_HAS_BUTTONS ! ~%wxver22 %define wxTR_TWIST_BUTTONS %define wxTR_NO_LINES ! ~%wxver22 %define wxTR_MAC_BUTTONS %define wxTR_SINGLE %define wxTR_MULTIPLE --- 783,791 ---- %include "wx/treectrl.h" ! %wxchkver23 %define wxTR_NO_BUTTONS %define wxTR_HAS_BUTTONS ! %wxchkver23 %define wxTR_TWIST_BUTTONS %define wxTR_NO_LINES ! %wxchkver23 %define wxTR_MAC_BUTTONS %define wxTR_SINGLE %define wxTR_MULTIPLE *************** *** 793,800 **** %define wxTR_EDIT_LABELS %define wxTR_LINES_AT_ROOT ! ~%wxver22 %define wxTR_HIDE_ROOT ! ~%wxver22 %define wxTR_ROW_LINES %define wxTR_HAS_VARIABLE_ROW_HEIGHT ! ~%wxver22 %define wxTR_DEFAULT_STYLE %enum wxTreeItemIcon --- 793,800 ---- %define wxTR_EDIT_LABELS %define wxTR_LINES_AT_ROOT ! %wxchkver23 %define wxTR_HIDE_ROOT ! %wxchkver23 %define wxTR_ROW_LINES %define wxTR_HAS_VARIABLE_ROW_HEIGHT ! %wxchkver23 %define wxTR_DEFAULT_STYLE %enum wxTreeItemIcon *************** *** 804,808 **** wxTreeItemIcon_SelectedExpanded wxTreeItemIcon_Max ! %end %define wxTREE_HITTEST_ABOVE --- 804,808 ---- wxTreeItemIcon_SelectedExpanded wxTreeItemIcon_Max ! %endenum %define wxTREE_HITTEST_ABOVE *************** *** 840,845 **** %property=Count, read // wxTextCtrl& GetEditControl() const ! <wxver25|%compat24 wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const ! ~<wxver25 wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetFirstVisibleItem() const %property=FirstVisibleItem, read --- 840,846 ---- %property=Count, read // wxTextCtrl& GetEditControl() const ! //%wxchkver22&!%wxchkver25|%wxcompat24 wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const ! //%wxchkver25 wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const ! wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const //override handles this wxTreeItemId GetFirstVisibleItem() const %property=FirstVisibleItem, read *************** *** 850,864 **** wxString GetItemText(const wxTreeItemId& item) const wxTreeItemId GetLastChild(const wxTreeItemId& item) const ! <wxver25|%compat24 wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const ! ~<wxver25 wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxTreeItemId GetNextVisible(const wxTreeItemId& item) const ! <wxver24 %rename GetItemParent wxTreeItemId GetParent(const wxTreeItemId& item) const ! ~<wxver24 wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxTreeItemId GetRootItem() const %property=RootItem, read ! <wxver25|%wxcompat24 int GetItemSelectedImage(const wxTreeItemId& item) const wxTreeItemId GetSelection() const %property=Selection, read --- 851,866 ---- wxString GetItemText(const wxTreeItemId& item) const wxTreeItemId GetLastChild(const wxTreeItemId& item) const ! //%wxchkver22&!%wxchkver25|%wxcompat24 wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const ! //%wxchkver25 wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const ! wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const // override handles this wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxTreeItemId GetNextVisible(const wxTreeItemId& item) const ! %wxchkver22&!%wxchkver24 %rename GetItemParent wxTreeItemId GetParent(const wxTreeItemId& item) const ! %wxchkver24 wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxTreeItemId GetRootItem() const %property=RootItem, read ! %wxchkver22&!%wxchkver25|%wxcompat24 int GetItemSelectedImage(const wxTreeItemId& item) const wxTreeItemId GetSelection() const %property=Selection, read *************** *** 885,889 **** void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE) void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal) ! <wxver25|%wxcompat24 void SetItemSelectedImage(const wxTreeItemId& item, int selImage) void SetItemText(const wxTreeItemId& item, const wxString& text) void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) --- 887,891 ---- void SetItemHasChildren(const wxTreeItemId& item, bool hasChildren = TRUE) void SetItemImage(const wxTreeItemId& item, int image, wxTreeItemIcon which = wxTreeItemIcon_Normal) ! %wxchkver22&!%wxchkver25|%wxcompat24 void SetItemSelectedImage(const wxTreeItemId& item, int selImage) void SetItemText(const wxTreeItemId& item, const wxString& text) void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) *************** *** 918,924 **** // wxTreeItemIdValue - wxTreeCtrl ! <wxver25 %skip %class %noclassinfo wxTreeItemIdValue %endclass /////////////////////////////////////////////////////////////////////////////// --- 920,927 ---- // wxTreeItemIdValue - wxTreeCtrl ! %if %wxchkver25 %class %noclassinfo wxTreeItemIdValue %endclass + %endif /////////////////////////////////////////////////////////////////////////////// *************** *** 928,934 **** wxTreeItemId() bool IsOk() ! double GetValue() const; ! void SetValue(double value); ! %property=Value, read, write); %endclass --- 931,937 ---- wxTreeItemId() bool IsOk() ! double GetValue() const ! void SetValue(double value) ! %property=Value, read, write %endclass *************** *** 987,992 **** wxPoint GetPoint() const %property=Point, read ! %wxver22 %rename GetKeyCode int GetCode() const ! ~%wxver22 int GetKeyCode() const %property=KeyCode, read const wxString& GetLabel() const --- 990,995 ---- wxPoint GetPoint() const %property=Point, read ! %wxchkver22&!%wxchkver23 %rename GetKeyCode int GetCode() const ! %wxchkver23 int GetKeyCode() const %property=KeyCode, read const wxString& GetLabel() const Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gdi.i 7 Jun 2005 05:56:57 -0000 1.2 --- gdi.i 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 105,109 **** wxPartRegion wxInRegion ! %end %class wxRegion, wxGDIObject --- 105,109 ---- wxPartRegion wxInRegion ! %endenum %class wxRegion, wxGDIObject *************** *** 185,189 **** wxITALIC wxSLANT ! %end %enum wxFontFamily --- 185,189 ---- wxITALIC wxSLANT ! %endenum %enum wxFontFamily *************** *** 196,201 **** wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! ~%wxver22 wxFONTFAMILY_UNKNOWN ! %end %enum wxFontStyle --- 196,201 ---- wxFONTFAMILY_TELETYPE wxFONTFAMILY_MAX ! %wxchkver23 wxFONTFAMILY_UNKNOWN ! %endenum %enum wxFontStyle *************** *** 204,208 **** wxFONTSTYLE_SLANT wxFONTSTYLE_MAX ! %end %enum wxFontWeight --- 204,208 ---- wxFONTSTYLE_SLANT wxFONTSTYLE_MAX ! %endenum %enum wxFontWeight *************** *** 211,215 **** wxFONTWEIGHT_BOLD wxFONTWEIGHT_MAX ! %end %enum wxFontEncoding --- 211,215 ---- wxFONTWEIGHT_BOLD wxFONTWEIGHT_MAX ! %endenum %enum wxFontEncoding *************** *** 241,248 **** wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! ~%wxver22 wxFONTENCODING_CP932 ! ~%wxver22 wxFONTENCODING_CP936 ! ~%wxver22 wxFONTENCODING_CP949 ! ~%wxver22 wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 --- 241,248 ---- wxFONTENCODING_CP866 wxFONTENCODING_CP874 ! %wxchkver23 wxFONTENCODING_CP932 ! %wxchkver23 wxFONTENCODING_CP936 ! %wxchkver23 wxFONTENCODING_CP949 ! %wxchkver23 wxFONTENCODING_CP950 wxFONTENCODING_CP1250 wxFONTENCODING_CP1251 *************** *** 254,262 **** wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! ~%wxver22 wxFONTENCODING_UTF7 ! ~%wxver22 wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX ! %end %class %delete wxFont, wxGDIObject --- 254,262 ---- wxFONTENCODING_CP1257 wxFONTENCODING_CP12_MAX ! %wxchkver23 wxFONTENCODING_UTF7 ! %wxchkver23 wxFONTENCODING_UTF8 wxFONTENCODING_UNICODE wxFONTENCODING_MAX ! %endenum %class %delete wxFont, wxGDIObject *************** *** 411,415 **** wxHORIZONTAL_HATCH wxVERTICAL_HATCH ! %end %class %delete wxPen, wxGDIObject --- 411,415 ---- wxHORIZONTAL_HATCH wxVERTICAL_HATCH ! %endenum %class %delete wxPen, wxGDIObject *************** *** 468,472 **** void RemovePen(wxPen *pen) wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) ! %enclass %endif wxLUA_USE_wxPenList --- 468,472 ---- void RemovePen(wxPen *pen) wxPen *FindOrCreatePen(const wxColour& colour, int width, int style) ! %endclass %endif wxLUA_USE_wxPenList *************** *** 543,594 **** /////////////////////////////////////////////////////////////////////////////// - - %if wxLUA_USE_wxBitmap - %if wxLUA_USE_wxIcon - %if wxLUA_USE_wxImage - - %enum wxBitmapType - wxBITMAP_TYPE_INVALID - wxBITMAP_TYPE_BMP - wxBITMAP_TYPE_BMP_RESOURCE - wxBITMAP_TYPE_RESOURCE - wxBITMAP_TYPE_BMP_RESOURCE - wxBITMAP_TYPE_ICO - wxBITMAP_TYPE_ICO_RESOURCE - wxBITMAP_TYPE_CUR - wxBITMAP_TYPE_CUR_RESOURCE - wxBITMAP_TYPE_XBM - wxBITMAP_TYPE_XBM_DATA - wxBITMAP_TYPE_XPM - wxBITMAP_TYPE_XPM_DATA - wxBITMAP_TYPE_TIF - wxBITMAP_TYPE_TIF_RESOURCE - wxBITMAP_TYPE_GIF - wxBITMAP_TYPE_GIF_RESOURCE - wxBITMAP_TYPE_PNG - wxBITMAP_TYPE_PNG_RESOURCE - wxBITMAP_TYPE_JPEG - wxBITMAP_TYPE_JPEG_RESOURCE - wxBITMAP_TYPE_PNM - wxBITMAP_TYPE_PNM_RESOURCE - wxBITMAP_TYPE_PCX - wxBITMAP_TYPE_PCX_RESOURCE - wxBITMAP_TYPE_PICT - wxBITMAP_TYPE_PICT_RESOURCE - wxBITMAP_TYPE_ICON - wxBITMAP_TYPE_ICON_RESOURCE - wxBITMAP_TYPE_MACCURSOR - wxBITMAP_TYPE_MACCURSOR_RESOURCE - wxBITMAP_TYPE_ANY - %end - - %endif wxLUA_USE_wxBitmap - %endif wxLUA_USE_wxIcon - %endif wxLUA_USE_wxImage - - /////////////////////////////////////////////////////////////////////////////// // wxIcon %if wxLUA_USE_wxIcon %class %delete wxIcon, wxGDIObject --- 543,550 ---- /////////////////////////////////////////////////////////////////////////////// // wxIcon %if wxLUA_USE_wxIcon + %typedef WXHANDLE void* %class %delete wxIcon, wxGDIObject *************** *** 598,610 **** //%constructor wxNewIcon(int width, int height, int depth = -1) // constructor does not exist %constructor wxDefaultIcon() ! %win void CopyFromBitmap(const wxBitmap& bmp) ! %mac void CopyFromBitmap(const wxBitmap& bmp) ! ~<wxver25 %gtk void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetWidth() int GetHeight() bool LoadFile(const wxString& name, wxBitmapType flags) ! // %win long GetHandle() // FIXME doesn't work in wx25 and for wxIcon what could you do with it ! // %win void SetHandle(long handle) bool Ok() void SetWidth(int w) --- 554,564 ---- //%constructor wxNewIcon(int width, int height, int depth = -1) // constructor does not exist %constructor wxDefaultIcon() ! %win|%mac|%wxchkver25 void CopyFromBitmap(const wxBitmap& bmp) int GetDepth() int GetWidth() int GetHeight() bool LoadFile(const wxString& name, wxBitmapType flags) ! %win WXHANDLE GetHandle() ! %win void SetHandle(WXHANDLE handle) bool Ok() void SetWidth(int w) *************** *** 631,635 **** %endclass ! ~<wxver25 %win %class %noclassinfo wxGDIImageHandlerList, wxList %endclass --- 585,589 ---- %endclass ! %wxchkver25&%win %class %noclassinfo wxGDIImageHandlerList, wxList %endclass *************** *** 643,653 **** %constructor wxBitmapFromFile( const wxString& name, long type) %constructor wxBitmapFromXPMData(const char **data) ! ~%wxver22 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) %win static void AddHandler(wxBitmapHandler* handler) %win static void CleanUpHandlers() virtual bool Create(int width, int height, int depth = -1) int GetDepth() const ! ~<wxver25 %win static wxGDIImageHandlerList& GetHandlers() ! <wxver25 %win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const --- 597,607 ---- %constructor wxBitmapFromFile( const wxString& name, long type) %constructor wxBitmapFromXPMData(const char **data) ! %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) %win static void AddHandler(wxBitmapHandler* handler) %win static void CleanUpHandlers() virtual bool Create(int width, int height, int depth = -1) int GetDepth() const ! %wxchkver25&%win static wxGDIImageHandlerList& GetHandlers() ! %wxchkver22&!%wxchkver25&%win static wxList& GetHandlers() int GetHeight() const wxPalette* GetPalette() const *************** *** 681,684 **** --- 635,640 ---- %if wxLUA_USE_wxCursor + %typedef WXHANDLE void* + %include "wx/cursor.h" *************** *** 686,690 **** wxCURSOR_NONE wxCURSOR_ARROW ! ~%wxver22 wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR --- 642,646 ---- wxCURSOR_NONE wxCURSOR_ARROW ! %wxchkver23 wxCURSOR_RIGHT_ARROW wxCURSOR_BULLSEYE wxCURSOR_CHAR *************** *** 712,716 **** wxCURSOR_BLANK wxCURSOR_DEFAULT ! %end %class %delete wxCursor, wxBitmap --- 668,672 ---- wxCURSOR_BLANK wxCURSOR_DEFAULT ! %endenum %class %delete wxCursor, wxBitmap *************** *** 724,730 **** %constructor wxStockCursor(int id) bool Ok() ! // %win long GetHandle() FIXME - wxCursor what could you do with this? ! // %win void SetHandle(long handle) ! // %win %property=Handle, read, write %win int GetWidth() %win int GetHeight() --- 680,686 ---- %constructor wxStockCursor(int id) bool Ok() ! %win WXHANDLE GetHandle() ! %win void SetHandle(WXHANDLE handle) ! %win %property=Handle, read, write %win int GetWidth() %win int GetHeight() *************** *** 784,789 **** bool Remove(int index) %win bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %gtk bool Replace(int index, const wxBitmap& bitmap) ! %mac bool Replace(int index, const wxBitmap& bitmap) //bool ReplaceIcon(int index, const wxIcon& icon) bool RemoveAll() --- 740,744 ---- bool Remove(int index) %win bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %gtk|%mac bool Replace(int index, const wxBitmap& bitmap) //bool ReplaceIcon(int index, const wxIcon& icon) bool RemoveAll() *************** *** 902,918 **** void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) // alias ! // wxBrush& GetBackground() removed in 2.5 ! const wxBrush& GetBackground() const int GetBackgroundMode() const ! // wxBrush& GetBrush() removed in 2.5 ! const wxBrush& GetBrush() const wxCoord GetCharHeight() wxCoord GetCharWidth() void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) ! const wxFont& GetFont() const int GetLogicalFunction() int GetMapMode() ! bool GetOptimization() ! const wxPen& GetPen() const // const wxPen& GetPen() const bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) --- 857,873 ---- void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) // alias ! const wxBrush& GetBackground() ! // const wxBrush& GetBackground() const int GetBackgroundMode() const ! const wxBrush& GetBrush() ! // const wxBrush& GetBrush() const wxCoord GetCharHeight() wxCoord GetCharWidth() void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *width, wxCoord *height) ! const wxFont& GetFont() int GetLogicalFunction() int GetMapMode() ! %wxchkver24&!%wxchkver25|%wxcompat24 bool GetOptimization() ! const wxPen& GetPen() // const wxPen& GetPen() const bool GetPixel(wxCoord x, wxCoord y, wxColour *colour) *************** *** 922,926 **** const wxColour& GetTextBackground() const void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) ! const wxColour& GetTextForeground() const // const wxColour& GetTextForeground() const void GetUserScale(double *x, double *y) --- 877,881 ---- const wxColour& GetTextBackground() const void GetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) ! const wxColour& GetTextForeground() // const wxColour& GetTextForeground() const void GetUserScale(double *x, double *y) *************** *** 949,954 **** %property=Font, read, write // void SetMapMode(int unit) ! void SetOptimization(bool optimize) ! %property=Optimization, read, write void SetPen(const wxPen& pen) %property=Pen, read, write --- 904,909 ---- %property=Font, read, write // void SetMapMode(int unit) ! %wxchkver24&!%wxchkver25|%wxcompat24 void SetOptimization(bool optimize) ! %wxchkver24&!%wxchkver25|%wxcompat24 %property=Optimization, read, write void SetPen(const wxPen& pen) %property=Pen, read, write Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.i 6 Jun 2005 23:06:07 -0000 1.1 --- html.i 18 Jun 2005 20:45:59 -0000 1.2 *************** *** 25,29 **** int GetHeight() const %property=Height, read ! ~%wxver22 virtual wxString GetId() const virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxHtmlCell* GetNext() const --- 25,29 ---- int GetHeight() const %property=Height, read ! %wxchkver23 virtual wxString GetId() const virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const wxHtmlCell* GetNext() const *************** *** 37,42 **** virtual void Layout(int w) //virtual void OnMouseClick(wxWindow* parent, intx, int y, const wxMouseEvent& event) ! ~%wxver22 void SetId(const wxString& id) ! ~%wxver22 %property=Id, read, write void SetLink(const wxHtmlLinkInfo& link) void SetNext(wxHtmlCell *cell) --- 37,42 ---- virtual void Layout(int w) //virtual void OnMouseClick(wxWindow* parent, intx, int y, const wxMouseEvent& event) ! %wxchkver23 void SetId(const wxString& id) ! %wxchkver23 %property=Id, read, write void SetLink(const wxHtmlLinkInfo& link) void SetNext(wxHtmlCell *cell) *************** *** 92,97 **** //bool IsEnding() const //wxString ScanParam(const wxString& par, const wxString &format, void *value) const ! ~%wxver22 bool GetParamAsColour(const wxString& par, wxColour *clr) const ! ~%wxver22 bool GetParamAsInt(const wxString& par, int *value) const %endclass --- 92,97 ---- //bool IsEnding() const //wxString ScanParam(const wxString& par, const wxString &format, void *value) const ! %wxchkver23 bool GetParamAsColour(const wxString& par, wxColour *clr) const ! %wxchkver23 bool GetParamAsInt(const wxString& par, int *value) const %endclass *************** *** 122,128 **** int GetAlignHor() const int GetAlignVer() const ! ~<wxver25 wxHtmlCell* GetFirstChild() ! <wxver25|%wxcompat24 wxHtmlCell* GetFirstCell() ! <wxver25|%wxcompat24 %property=FirstCell, read int GetIndent(int ind) const int GetIndentUnits(int ind) const --- 122,128 ---- int GetAlignHor() const int GetAlignVer() const ! %wxchkver25 wxHtmlCell* GetFirstChild() ! %wxchkver22&!%wxchkver25|%wxcompat24 wxHtmlCell* GetFirstCell() ! %wxchkver22&!%wxchkver25|%wxcompat24 %property=FirstCell, read int GetIndent(int ind) const int GetIndentUnits(int ind) const *************** *** 152,156 **** wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "htmlWindow") //static void AddFilter(wxHtmlFilter *filter) ! ~%wxver22 bool AppendToPage(const wxString& source) wxHtmlContainerCell* GetInternalRepresentation() const %property=InternalRepresentation, read --- 152,156 ---- wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "htmlWindow") //static void AddFilter(wxHtmlFilter *filter) ! %wxchkver23 bool AppendToPage(const wxString& source) wxHtmlContainerCell* GetInternalRepresentation() const %property=InternalRepresentation, read *************** *** 163,171 **** wxFrame* GetRelatedFrame() const %property=RelatedFrame, read ! ~%wxver22 bool HistoryBack() ! ~%wxver22 bool HistoryCanBack() ! ~%wxver22 bool HistoryCanForward() ! ~%wxver22 void HistoryClear() ! ~%wxver22 bool HistoryForward() bool LoadPage(const wxString& location) void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString) --- 163,171 ---- wxFrame* GetRelatedFrame() const %property=RelatedFrame, read ! %wxchkver23 bool HistoryBack() ! %wxchkver23 bool HistoryCanBack() ! %wxchkver23 bool HistoryCanForward() ! %wxchkver23 void HistoryClear() ! %wxchkver23 bool HistoryForward() bool LoadPage(const wxString& location) void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString) *************** *** 270,274 **** bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = wxEmptyString) ! <wxver25 void PrinterSetup() void PageSetup() wxPrintData* GetPrintData() --- 270,274 ---- bool PrintFile(const wxString& htmlfile) bool PrintText(const wxString& htmltext, const wxString& basepath = wxEmptyString) ! %wxchkver24&!%wxchkver25 void PrinterSetup() void PageSetup() wxPrintData* GetPrintData() Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** datetime.i 6 Jun 2005 23:06:07 -0000 1.1 --- datetime.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 17,23 **** %builtin long wxGetElapsedTime(bool resetTimer = TRUE) %builtin void wxSleep(int secs) ! >wxver24 %builtin void wxMilliSleep(unsigned long milliseconds); ! >wxver24 %builtin void wxMicroSleep(unsigned long microseconds); ! <wxver25 %builtin void wxUsleep(unsigned long milliseconds) /////////////////////////////////////////////////////////////////////////////// --- 17,23 ---- %builtin long wxGetElapsedTime(bool resetTimer = TRUE) %builtin void wxSleep(int secs) ! %wxchkver25 %builtin void wxMilliSleep(unsigned long milliseconds) ! %wxchkver25 %builtin void wxMicroSleep(unsigned long microseconds) ! !%wxchkver25 %builtin void wxUsleep(unsigned long milliseconds) /////////////////////////////////////////////////////////////////////////////// *************** *** 81,90 **** A_ESST UTC ! %end %enum wxDateTime::Calendar Gregorian Julian ! %end %enum wxDateTime::Country --- 81,90 ---- A_ESST UTC ! %endenum %enum wxDateTime::Calendar Gregorian Julian ! %endenum %enum wxDateTime::Country *************** *** 99,103 **** Russia USA ! %end %enum wxDateTime::Month --- 99,103 ---- Russia USA ! %endenum %enum wxDateTime::Month *************** *** 115,119 **** Dec Inv_Month ! %end %enum wxDateTime::WeekDay --- 115,119 ---- Dec Inv_Month ! %endenum %enum wxDateTime::WeekDay *************** *** 126,132 **** Sat Inv_WeekDay ! %end ! %typedef wxDateTime_t unsigned short %class %delete %noclassinfo %encapsulate wxDateTime --- 126,132 ---- Sat Inv_WeekDay ! %endenum ! %typedef wxDateTime::wxDateTime_t unsigned short %class %delete %noclassinfo %encapsulate wxDateTime *************** *** 136,154 **** %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(wxDateTime_t hour, wxDateTime_t minute, wxDateTime_t second, wxDateTime_t millisec) ! %constructor wxDateTimeFromDMY(wxDateTime_t day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, wxDateTime_t hour = 0, wxDateTime_t minute = 0, wxDateTime_t second = 0, wxDateTime_t millisec = 0u) wxDateTime& SetToCurrent() %rename SetToTime wxDateTime& Set(long time) %rename SetToJDN wxDateTime& Set(double dateTime) ! %rename SetToHMS wxDateTime& Set(wxDateTime_t hour, wxDateTime_t minute, wxDateTime_t second, wxDateTime_t millisec) ! %rename SetToDMY wxDateTime& Set(wxDateTime_t day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, wxDateTime_t hour = 0, wxDateTime_t minute = 0, wxDateTime_t second = 0, wxDateTime_t millisec = 0) wxDateTime& ResetTime() ! wxDateTime& SetDay(wxDateTime_t day) wxDateTime& SetMonth(wxDateTime::Month month) wxDateTime& SetYear(int year) ! wxDateTime& SetHour(wxDateTime_t hour) ! wxDateTime& SetMinute(wxDateTime_t minute) ! wxDateTime& SetSecond(wxDateTime_t second) ! wxDateTime& SetMillisecond(wxDateTime_t millisecond) bool IsWorkDay(wxDateTime::Country country = wxDateTime::Country_Default) const bool IsEqualTo(const wxDateTime& datetime) const --- 136,154 ---- %constructor wxDateTimeFromTime(time_t dateTime) %constructor wxDateTimeFromJDN(double dateTime) ! %constructor wxDateTimeFromHMS(int hour, int minute, int second, int millisec) ! %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() %rename SetToTime wxDateTime& Set(long time) %rename SetToJDN wxDateTime& Set(double dateTime) ! %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) ! %rename SetToDMY wxDateTime& Set(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& ResetTime() ! wxDateTime& SetDay(int day) wxDateTime& SetMonth(wxDateTime::Month month) wxDateTime& SetYear(int year) ! wxDateTime& SetHour(int hour) ! wxDateTime& SetMinute(int minute) ! wxDateTime& SetSecond(int second) ! wxDateTime& SetMillisecond(int millisecond) bool IsWorkDay(wxDateTime::Country country = wxDateTime::Country_Default) const bool IsEqualTo(const wxDateTime& datetime) const *************** *** 172,182 **** bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! <wxver25 bool SetToTheWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! <wxver25 wxDateTime GetWeek(wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! >wxver24 static wxDateTime SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const ! wxDateTime& SetToYearDay(wxDateTime_t yday) ! wxDateTime GetYearDay(wxDateTime_t yday) const double GetJulianDayNumber() const double GetJDN() const --- 172,182 ---- bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const ! %wxchkver25 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) const ! wxDateTime& SetToYearDay(wxDateTime::wxDateTime_t yday) ! wxDateTime GetYearDay(wxDateTime::wxDateTime_t yday) const double GetJulianDayNumber() const double GetJDN() const *************** *** 326,332 **** wxCAL_NO_YEAR_CHANGE wxCAL_NO_MONTH_CHANGE ! ~%wxver22 wxCAL_SHOW_SURROUNDING_WEEKS ! ~%wxver22 wxCAL_SEQUENTIAL_MONTH_SELECTION ! %end %enum wxCalendarHitTestResult --- 326,332 ---- wxCAL_NO_YEAR_CHANGE wxCAL_NO_MONTH_CHANGE ! %wxchkver23 wxCAL_SHOW_SURROUNDING_WEEKS ! %wxchkver23 wxCAL_SEQUENTIAL_MONTH_SELECTION ! %endenum %enum wxCalendarHitTestResult *************** *** 334,341 **** wxCAL_HITTEST_HEADER wxCAL_HITTEST_DAY ! ~%wxver22 wxCAL_HITTEST_INCMONTH ! ~%wxver22 wxCAL_HITTEST_DECMONTH ! ~%wxver22 wxCAL_HITTEST_SURROUNDING_WEEK ! %end %enum wxCalendarDateBorder --- 334,341 ---- wxCAL_HITTEST_HEADER wxCAL_HITTEST_DAY ! %wxchkver23 wxCAL_HITTEST_INCMONTH ! %wxchkver23 wxCAL_HITTEST_DECMONTH ! %wxchkver23 wxCAL_HITTEST_SURROUNDING_WEEK ! %endenum %enum wxCalendarDateBorder *************** *** 343,347 **** wxCAL_BORDER_SQUARE wxCAL_BORDER_ROUND ! %end %class wxCalendarCtrl, wxControl --- 343,347 ---- wxCAL_BORDER_SQUARE wxCAL_BORDER_ROUND ! %endenum %class wxCalendarCtrl, wxControl Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua.i 7 Jun 2005 04:17:38 -0000 1.2 --- wxlua.i 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 83,88 **** %if wxLUA_USE_wxLuaPrintout ! %inlinefile printing.h ! %inlinefile printing.cpp %class %delete wxLuaPrintout, wxPrintout --- 83,87 ---- %if wxLUA_USE_wxLuaPrintout ! %include "wxbind/include/wxlprint.h" %class %delete wxLuaPrintout, wxPrintout *************** *** 99,104 **** %if wxLUA_USE_wxLuaHtmlWindow ! %inlinefile htmlwin.h ! %inlinefile htmlwin.cpp %class wxLuaHtmlWindow, wxHtmlWindow --- 98,102 ---- %if wxLUA_USE_wxLuaHtmlWindow ! %include "wxbind/include/wxlhtmlwin.h" %class wxLuaHtmlWindow, wxHtmlWindow Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clipdrag.i 6 Jun 2005 23:06:07 -0000 1.1 --- clipdrag.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 17,21 **** %class wxClipboard, wxObject ! <wxver25 %define %pointer wxTheClipboard void UsePrimarySelection( bool primary = FALSE ) --- 17,21 ---- %class wxClipboard, wxObject ! !%wxchkver25 %define %pointer wxTheClipboard void UsePrimarySelection( bool primary = FALSE ) *************** *** 29,33 **** void Close() bool Open() ! <wxver24 %skip static wxClipboard *Get() %endclass --- 29,33 ---- void Close() bool Open() ! %wxchkver25 static wxClipboard *Get() %endclass *************** *** 60,66 **** wxDF_LOCALE wxDF_PRIVATE ! ~%wxver22 wxDF_HTML ! ~%wxver22 wxDF_MAX ! %end %class %delete %noclassinfo %encapsulate wxDataFormat --- 60,66 ---- wxDF_LOCALE wxDF_PRIVATE ! %wxchkver23 wxDF_HTML ! %wxchkver23 wxDF_MAX ! %endenum %class %delete %noclassinfo %encapsulate wxDataFormat *************** *** 83,87 **** Get Set ! %end %class %noclassinfo wxDataObject --- 83,87 ---- Get Set ! %endenum %class %noclassinfo wxDataObject *************** *** 164,172 **** %include "wx/dnd.h" ! ~%wxver22 %enum ! ~%wxver22 wxDrag_CopyOnly ! ~%wxver22 wxDrag_AllowMove ! ~%wxver22 wxDrag_DefaultMove ! ~%wxver22 %end %enum wxDragResult --- 164,174 ---- %include "wx/dnd.h" ! %if %wxchkver23 ! %enum ! wxDrag_CopyOnly ! wxDrag_AllowMove ! wxDrag_DefaultMove ! %endenum ! %endif %enum wxDragResult *************** *** 176,180 **** wxDragMove wxDragCancel ! %end %builtin bool wxIsDragResultOk(wxDragResult res) --- 178,182 ---- wxDragMove wxDragCancel ! %endenum %builtin bool wxIsDragResultOk(wxDragResult res) *************** *** 211,219 **** %class %delete %noclassinfo %encapsulate wxDropSource %win wxDropSource(wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %mac wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) %win %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) ! %mac %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) virtual wxDragResult DoDragDrop(bool allowMove = FALSE) --- 213,219 ---- %class %delete %noclassinfo %encapsulate wxDropSource %win wxDropSource(wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk|%mac wxDropSource(wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) %win %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxCursor& iconCopy = wxNullCursor, const wxCursor& iconMove = wxNullCursor, const wxCursor& iconStop = wxNullCursor) ! %gtk|%mac %constructor wxDropSourceData(wxDataObject& data, wxWindow* win = NULL, const wxIcon& iconCopy = wxNullIcon, const wxIcon& iconMove = wxNullIcon, const wxIcon& iconStop = wxNullIcon) void SetData(wxDataObject& data) virtual wxDragResult DoDragDrop(bool allowMove = FALSE) *************** *** 241,249 **** %if wxLUA_USE_wxMetafile %include "wx/metafile.h" //%builtin bool wxMakeMetafilePlaceable(const wxString& filename, int minX, int minY, int maxX, int maxY, float scale = 1.0) - %gtk %skip %class %noclassinfo wxMetafile, wxObject wxMetafile(const wxString& filename = "") --- 241,250 ---- %if wxLUA_USE_wxMetafile + %if %msw|%mac|%os2 + %include "wx/metafile.h" //%builtin bool wxMakeMetafilePlaceable(const wxString& filename, int minX, int minY, int maxX, int maxY, float scale = 1.0) %class %noclassinfo wxMetafile, wxObject wxMetafile(const wxString& filename = "") *************** *** 255,260 **** /////////////////////////////////////////////////////////////////////////////// // wxMetafileDC - - %gtk %skip %class %delete %noclassinfo wxMetafileDC, wxDC wxMetafileDC(const wxString& filename = "") --- 256,259 ---- *************** *** 262,264 **** --- 261,265 ---- %endclass + %endif + %endif wxLUA_USE_wxMetafile Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** defsutil.i 6 Jun 2005 23:06:07 -0000 1.1 --- defsutil.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 24,30 **** // Process control functions ! %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) %builtin void wxExit() ! ~%wxver22 %builtin unsigned long wxGetProcessId() %builtin bool wxShell(const wxString& command = "") --- 24,31 ---- // Process control functions ! // FIXME add wxProcess %builtin long wxExecute(const wxString& command, bool sync = FALSE, wxProcess *callback = NULL) ! %builtin void wxExit() ! %wxchkver23 %builtin unsigned long wxGetProcessId() %builtin bool wxShell(const wxString& command = "") *************** *** 57,65 **** // GDI functions ! ~%wxver22 %builtin void wxClientDisplayRect(int *x, int *y, int *width, int *height) %builtin bool wxColourDisplay() %builtin int wxDisplayDepth() %builtin void wxDisplaySize(int *width, int *height) ! ~%wxver22 %builtin void wxDisplaySizeMM(int *width, int *height) %builtin void wxSetCursor(const wxCursor &cursor) // %builtin wxIconOrCursor wxDROP_ICON(wxString name) --- 58,66 ---- // GDI functions ! %wxchkver23 %builtin void wxClientDisplayRect(int *x, int *y, int *width, int *height) %builtin bool wxColourDisplay() %builtin int wxDisplayDepth() %builtin void wxDisplaySize(int *width, int *height) ! %wxchkver23 %builtin void wxDisplaySizeMM(int *width, int *height) %builtin void wxSetCursor(const wxCursor &cursor) // %builtin wxIconOrCursor wxDROP_ICON(wxString name) *************** *** 74,86 **** %builtin wxWindow* wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL) %builtin wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent=NULL) ! ~%wxver22 %builtin wxWindow* wxFindWindowAtPoint(const wxPoint& pt) ! ~%wxver22 %builtin wxWindow* wxFindWindowAtPointer(wxPoint& pt) %win %builtin wxWindow* wxGetActiveWindow() // X only %builtin wxString wxGetDisplayName() // X only %builtin void wxSetDisplayName(const wxString& displayName) ! ~%wxver22 %builtin wxPoint wxGetMousePosition() // %builtin bool wxGetResource(const wxString& section, const wxString& entry, const wxString& *value, const wxString& file = "") // %builtin bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "") ! ~%wxver22 %builtin wxWindow * wxGetTopLevelParent(wxWindow *win) //%win %builtin wxString wxLoadUserResource(const wxString& resourceName, const wxString& resourceType="TEXT") %builtin void wxPostEvent(wxEvtHandler *dest, wxEvent& event) --- 75,87 ---- %builtin wxWindow* wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL) %builtin wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent=NULL) ! %wxchkver23 %builtin wxWindow* wxFindWindowAtPoint(const wxPoint& pt) ! %wxchkver23 %builtin wxWindow* wxFindWindowAtPointer(wxPoint& pt) %win %builtin wxWindow* wxGetActiveWindow() // X only %builtin wxString wxGetDisplayName() // X only %builtin void wxSetDisplayName(const wxString& displayName) ! %wxchkver23 %builtin wxPoint wxGetMousePosition() // %builtin bool wxGetResource(const wxString& section, const wxString& entry, const wxString& *value, const wxString& file = "") // %builtin bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "") ! %wxchkver23 %builtin wxWindow * wxGetTopLevelParent(wxWindow *win) //%win %builtin wxString wxLoadUserResource(const wxString& resourceName, const wxString& resourceType="TEXT") %builtin void wxPostEvent(wxEvtHandler *dest, wxEvent& event) *************** *** 99,103 **** %define wxID_CLEAR %define wxID_CLOSE ! ~%wxver22 %define wxID_CONTEXT_HELP %define wxID_COPY %define wxID_CUT --- 100,104 ---- %define wxID_CLEAR %define wxID_CLOSE ! %wxchkver23 %define wxID_CONTEXT_HELP %define wxID_COPY %define wxID_CUT *************** *** 159,163 **** wxEAST wxALL ! %end %enum wxAlignment --- 160,164 ---- wxEAST wxALL ! %endenum %enum wxAlignment *************** *** 173,178 **** wxALIGN_CENTER wxALIGN_CENTRE ! ~%wxver22 wxALIGN_MASK ! %end %enum wxStretch --- 174,179 ---- wxALIGN_CENTER wxALIGN_CENTRE ! %wxchkver23 wxALIGN_MASK ! %endenum %enum wxStretch *************** *** 182,200 **** wxEXPAND wxSHAPED ! ~%wxver22 wxADJUST_MINSIZE ! ~%wxver22 wxTILE ! %end // border flags: the values are chosen for backwards compatibility ! ~%wxver22 %enum wxBorder ! ~%wxver22 wxBORDER_DEFAULT ! ~%wxver22 wxBORDER_NONE ! ~%wxver22 wxBORDER_STATIC ! ~%wxver22 wxBORDER_SIMPLE ! ~%wxver22 wxBORDER_RAISED ! ~%wxver22 wxBORDER_SUNKEN ! ~%wxver22 wxBORDER_DOUBLE ! ~%wxver22 wxBORDER_MASK ! ~%wxver22 %end %include "wx/txtstrm.h" --- 183,203 ---- wxEXPAND wxSHAPED ! %wxchkver23 wxADJUST_MINSIZE ! %wxchkver23 wxTILE ! %endenum // border flags: the values are chosen for backwards compatibility ! %if %wxchkver23 ! %enum wxBorder ! wxBORDER_DEFAULT ! wxBORDER_NONE ! wxBORDER_STATIC ! wxBORDER_SIMPLE ! wxBORDER_RAISED ! wxBORDER_SUNKEN ! wxBORDER_DOUBLE ! wxBORDER_MASK ! %endenum ! %endif %include "wx/txtstrm.h" *************** *** 204,206 **** wxEOL_MAC wxEOL_DOS ! %end --- 207,209 ---- wxEOL_MAC wxEOL_DOS ! %endenum Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.i 6 Jun 2005 23:06:07 -0000 1.1 --- event.i 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 44,48 **** %include "wx/event.h" ! ~<wxver23 %include "wx/tglbtn.h" // for wxEVT_COMMAND_TOGGLEBUTTON_CLICKED %class %delete wxCommandEvent, wxEvent --- 44,48 ---- %include "wx/event.h" ! %wxchkver24 %include "wx/tglbtn.h" // for wxEVT_COMMAND_TOGGLEBUTTON_CLICKED %class %delete wxCommandEvent, wxEvent *************** *** 66,71 **** %define %event wxEVT_COMMAND_TEXT_ENTER %define %event wxEVT_COMMAND_TEXT_UPDATED ! ~%wxver22 %define %event wxEVT_COMMAND_TEXT_URL ! ~%wxver22 %define %event wxEVT_COMMAND_TEXT_MAXLEN %define %event wxEVT_COMMAND_SPINCTRL_UPDATED --- 66,71 ---- %define %event wxEVT_COMMAND_TEXT_ENTER %define %event wxEVT_COMMAND_TEXT_UPDATED ! %wxchkver23 %define %event wxEVT_COMMAND_TEXT_URL ! %wxchkver23 %define %event wxEVT_COMMAND_TEXT_MAXLEN %define %event wxEVT_COMMAND_SPINCTRL_UPDATED *************** *** 80,84 **** %define %event wxEVT_COMMAND_CHECKBOX_CLICKED %define %event wxEVT_COMMAND_BUTTON_CLICKED ! ~<wxver23 %define %event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxCommandEvent(wxEventType commandEventType = 0, int id = 0) --- 80,84 ---- %define %event wxEVT_COMMAND_CHECKBOX_CLICKED %define %event wxEVT_COMMAND_BUTTON_CLICKED ! %wxchkver24 %define %event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxCommandEvent(wxEventType commandEventType = 0, int id = 0) *************** *** 147,152 **** // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? %include "wx/dialup.h" ! %mac %skip %class %noclassinfo wxDialUpEvent, wxCommandEvent %define %event wxEVT_DIALUP_CONNECTED --- 147,153 ---- // wxDialUpEvent - TODO - the rest of wxDialUp is missing, any... [truncated message content] |
|
From: John L. <jr...@us...> - 2005-06-18 20:46:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/modules/wxlua/include Modified Files: internal.h interp.h library.h wxlua.h Log Message: Updated to wxIDE's wrapper files Index: interp.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/interp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interp.h 7 Jun 2005 04:17:39 -0000 1.2 --- interp.h 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 30,36 **** class WXDLLEXPORT wxEvtHandler; ! class wxLuaEvent; ! class wxLuaStateVariables; ! class wxLuaInterpreter; #include "wx/hashmap.h" --- 30,36 ---- class WXDLLEXPORT wxEvtHandler; ! class WXDLLIMPEXP_WXLUA wxLuaEvent; ! class WXDLLIMPEXP_WXLUA wxLuaStateVariables; ! class WXDLLIMPEXP_WXLUA wxLuaInterpreter; #include "wx/hashmap.h" *************** *** 52,56 **** //----------------------------------------------------------------------------- ! class wxLuaInterpreter : public wxObject { public: --- 52,56 ---- //----------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaInterpreter : public wxObject { public: *************** *** 70,74 **** // destroy and cleanup the interpreter, returns sucess // if 'force' then make sure all wxWindows are destroyed. ! bool Destroy(bool force = TRUE); // has the interpreter been sucessfully created --- 70,77 ---- // destroy and cleanup the interpreter, returns sucess // if 'force' then make sure all wxWindows are destroyed. ! bool Destroy(bool force = true); ! ! // cleanup window list ! void GarbageCollectWindows(bool closeWindows = false); // has the interpreter been sucessfully created *************** *** 77,85 **** // Set the event handler that the events will be sent to, can be null void SetEventHandler(wxEvtHandler *evtHandler); ! wxEvtHandler *GetEventHandler() const; // Get/Set the id that the events will be sent with ! void SetId(int id); ! int GetId() const; // Run a lua file --- 80,88 ---- // Set the event handler that the events will be sent to, can be null void SetEventHandler(wxEvtHandler *evtHandler); ! wxEvtHandler *GetEventHandler() const { return m_evtHandler; } // Get/Set the id that the events will be sent with ! void SetId(int id) { m_id = id; } ! int GetId() const { return m_id; } // Run a lua file *************** *** 91,100 **** // Is a program running now ! bool IsRunning() const; // Break a currently running lua program void Break(const wxString &message = wxT("Interpreter stopped")); // has Break() been called ! bool GetBreak() const; ! wxString GetBreakMessage() const; // Have lua run an internal hook function with this mask --- 94,103 ---- // Is a program running now ! bool IsRunning() const { return m_is_running; } // Break a currently running lua program void Break(const wxString &message = wxT("Interpreter stopped")); // has Break() been called ! bool GetBreak() const { return m_user_break; } ! wxString GetBreakMessage() const { return m_break_msg; } // Have lua run an internal hook function with this mask *************** *** 108,115 **** bool send_debug_evt = FALSE, int hook = LUA_MASKCOUNT); ! int GetLuaDebugHookCount() const; ! int GetLuaDebugHookYield() const; ! bool GetLuaDebugHookSendEvt() const; ! int GetLuaDebugHook() const; // registers a new function for Lua --- 111,118 ---- bool send_debug_evt = FALSE, int hook = LUA_MASKCOUNT); ! int GetLuaDebugHookCount() const { return m_lua_debug_hook_count; } ! int GetLuaDebugHookYield() const { return m_lua_debug_hook_yield; } ! bool GetLuaDebugHookSendEvt() const { return m_lua_debug_hook_send_evt; } ! int GetLuaDebugHook() const { return m_lua_debug_hook; } // registers a new function for Lua *************** *** 168,172 **** //----------------------------------------------------------------------------- ! class wxLuaEvent: public wxNotifyEvent { public: --- 171,175 ---- //----------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaEvent: public wxNotifyEvent { public: *************** *** 204,223 **** BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION, 0) // a wxLuaInterpreter is being created ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_CONSOLE, 0) // print statements and such, check GetString() ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_WARNING, 0) // unused, lua doesn't seem to warn for anything ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR, 0) // error occurred, check GetString() ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUA_SHUTDOWN, 0) // unused, I used this in some other interpreter, not sure why it'd be useful END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&); ! #define EVT_LUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_CONSOLE(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CONSOLE, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_WARNING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_WARNING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_DEBUG_HOOK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_SHUTDOWN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_SHUTDOWN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #endif // _WX_LUA_INTERPRETER_H_ --- 207,230 ---- BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION, 0) // a wxLuaInterpreter is being created ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CONSOLE, 0) // print statements and such, check GetString() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_WARNING, 0) // unused, lua doesn't seem to warn for anything ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR, 0) // error occurred, check GetString() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_SHUTDOWN, 0) // unused, I used this in some other interpreter, not sure why it'd be useful ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_INIT, 0) // after app starts, first idle ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUGGERATTACHED, 0) // after app starts, first idle END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&); ! #define EVT_LUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_CONSOLE(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CONSOLE, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_WARNING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_WARNING, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_DEBUG_HOOK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_SHUTDOWN(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_SHUTDOWN, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_INIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #endif // _WX_LUA_INTERPRETER_H_ Index: wxlua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlua.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlua.h 7 Jun 2005 04:17:39 -0000 1.2 --- wxlua.h 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 25,31 **** #endif - // This is the function you need to call to initialize wxLua - void LUACALL RegisterWxLua(lua_State *L, bool registerTypes = true); - // Two cases where you might multiply call RegisterWxLua: // 1. You have several lua_State values. Then registerTypes --- 25,28 ---- Index: library.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/library.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.h 7 Jun 2005 04:17:39 -0000 1.2 --- library.h 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 37,41 **** virtual bool ProcessEvent(wxEvent& event) = 0; ! virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0; virtual void DisplayError(const wxString &strError) const = 0; --- 37,43 ---- virtual bool ProcessEvent(wxEvent& event) = 0; ! //#if wxUSE_LUASTACKFRAME ! // virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) = 0; ! //#endif // wxUSE_LUASTACKFRAME virtual void DisplayError(const wxString &strError) const = 0; Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** internal.h 7 Jun 2005 04:17:39 -0000 1.2 --- internal.h 18 Jun 2005 20:45:59 -0000 1.3 *************** *** 73,80 **** WXLUAMETHOD *methods; // pointer to methods for this class int num_methods; // number of methods ! int baseclassindex; // index in the class list to the base class wxClassInfo *pClassInfo; // pointer to the wxClassInfo associated with this class int *class_tag; // tag for user data allocated by ourselves // and therefore needs gc. }; --- 73,81 ---- WXLUAMETHOD *methods; // pointer to methods for this class int num_methods; // number of methods ! int baseclass_tag; // index in the class list to the base class wxClassInfo *pClassInfo; // pointer to the wxClassInfo associated with this class int *class_tag; // tag for user data allocated by ourselves // and therefore needs gc. + const char *baseclass; // name of base class }; *************** *** 82,86 **** --- 83,89 ---- { const char *name; // name + bool isString; // true if a string definition FIXME use WXLUASTRING double value; // numeric value + const wxChar *strValue; // string value }; *************** *** 106,115 **** }; ! // Functions defined in wxLuaWrap.cpp ! extern WXLUACLASS *GetClassList(size_t &count); ! extern WXLUADEFINE *GetDefineList(size_t &count); ! extern WXLUASTRING *GetStringList(size_t &count); ! extern WXLUAEVENT *GetEventList(size_t &count); ! extern WXLUAOBJECT *GetObjectList(size_t &count); // ---------------------------------------------------------------------------- --- 109,181 ---- }; ! typedef WXLUACLASS* (*GetClassListFunction)(size_t &); ! typedef WXLUADEFINE* (*GetDefineListFunction)(size_t &); ! //typedef WXLUASTRING* (*GetDefineListFunction)(size_t &); FIXME - use this ! typedef WXLUAEVENT* (*GetEventListFunction)(size_t &); ! typedef WXLUAOBJECT* (*GetObjectListFunction)(size_t &); ! ! class WXDLLIMPEXP_WXLUA wxLuaBinding : public wxObject ! { ! public: ! wxLuaBinding(); ! ! // lua namespace e.g. "wx" ! wxString nameSpace; ! ! // Pointers to external Binding Functions ! GetClassListFunction pfGetClassList; ! GetDefineListFunction pfGetDefineList; ! GetEventListFunction pfGetEventList; ! GetObjectListFunction pfGetObjectList; ! ! // Registers binding ! void RegisterBinding(lua_State *L, bool registerTypes); ! void UnRegisterBinding(lua_State *L); ! ! // ! size_t GetLuaClassCount() const { return m_classCount; } ! WXLUACLASS* GetLuaClassList() { return m_classList; } ! ! size_t GetLuaDefineCount() const { return m_defineCount; } ! WXLUADEFINE* GetLuaDefineList() { return m_defineList; } ! ! size_t GetLuaEventCount() { return m_eventCount; } ! WXLUAEVENT* GetLuaEventList() { return m_eventList; } ! ! size_t GetLuaObjectCount() { return m_objectCount; } ! WXLUAOBJECT* GetLuaObjectList() { return m_objectList; } ! ! bool IsTag(int tag) { return (tag >= m_startTag && tag <= m_lastTag); } ! ! // Look for base class WXDLLIMPEXP_CDLUA in binding, set baseclass_tag ! bool SetBaseClassTag(WXLUACLASS *pClass); ! ! protected: ! int LUACALL RegisterFunctions(lua_State *L, bool registerTypes); ! void LUACALL RegisterGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes); ! ! virtual void OnRegister(lua_State * WXUNUSED(L), bool WXUNUSED(registerTypes), int WXUNUSED(luaTable)) {} ! ! // binding objects ! size_t m_classCount; ! WXLUACLASS* m_classList; ! size_t m_defineCount; ! WXLUADEFINE* m_defineList; ! size_t m_eventCount; ! WXLUAEVENT* m_eventList; ! size_t m_objectCount; ! WXLUAOBJECT* m_objectList; ! ! bool m_typesRegistered; // Is the binding registered ! int m_startTag; // The first wxLua allocated lua tag ! int m_lastTag; // The last wxLua lua tag of registered classes ! int m_wxLuaTable; // The lua tag for the wxLua private tables ! ! DECLARE_CLASS(wxLuaBinding) ! }; ! ! // list of wxLua Bindings ! // WX_DECLARE_LIST(wxLuaBinding, wxLuaBindingList); ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaBinding, wxLuaBindingList, WXDLLIMPEXP_WXLUA); // ---------------------------------------------------------------------------- *************** *** 125,129 **** void ClearCallbacks(); ! bool m_typesRegistered; // wxWidgets classes are registed to lua int m_startTag; // The first wxLua allocated lua tag int m_lastTag; // The last wxLua lua tag of registered classes --- 191,209 ---- void ClearCallbacks(); ! void LUACALL RegisterBindings(lua_State *L, bool registerTypes); ! void LUACALL UnRegisterBindings(lua_State *L); ! ! wxLuaBinding* GetLuaBinding(const wxString& nameSpace); ! ! const WXLUACLASS * GetLuaClass(int iClassTag); ! const WXLUACLASS * GetLuaClass(const char* className); ! const WXLUACLASS * GetBaseLuaClass(int iClassTag); ! bool IsDerivedClass(int iClassTag, int iBaseClassTag); ! ! const WXLUAEVENT * GetLuaEvent(wxEvent *pEvent); ! ! wxLuaBindingList m_bindings; // A list of generated lua bindings ! ! bool m_typesRegistered; // Is the binding registered int m_startTag; // The first wxLua allocated lua tag int m_lastTag; // The last wxLua lua tag of registered classes *************** *** 165,169 **** // automatic destructor for making binding easier // ---------------------------------------------------------------------------- ! class SmartStringArray { public: --- 245,249 ---- // automatic destructor for making binding easier // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA SmartStringArray { public: *************** *** 181,185 **** // automatic destructor for making binding easier // ---------------------------------------------------------------------------- ! class SmartIntArray { public: --- 261,265 ---- // automatic destructor for making binding easier // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA SmartIntArray { public: *************** *** 242,245 **** --- 322,329 ---- // ---------------------------------------------------------------------------- + #ifdef GetObject + #undef GetObject + #endif + class WXDLLIMPEXP_WXLUA wxLuaObject : public wxObject { *************** *** 291,294 **** --- 375,384 ---- // ---------------------------------------------------------------------------- + // Lua Registry Table Functions + int LUACALL tinsert(lua_State *L, int iParam); + bool LUACALL tremove(lua_State *L, int iIndex); + bool LUACALL tget(lua_State *L, int iIndex); + int LUACALL tgetn (lua_State *L); + // get a user data type (either allocated by us if the tag is iTagS otherwise // system allocated iTagP. if the data type does not have the correct tag, *************** *** 323,328 **** int * LUACALL tointarray(lua_State *, int iParam, int &count); int LUACALL toarrayint(lua_State *L, int iParam, wxArrayInt &intArray); - // register all the generated classes - void LUACALL registerGeneratedClasses(lua_State *L, int tableOffset, bool registerTypes); // register non-generated functions and types --- 413,416 ---- *************** *** 346,352 **** // get the method or 'get' property for the class at cpIndex ! WXLUAMETHOD * LUACALL getLuaMethod(WXLUACLASS *pClass, const char *cpIndex, bool &isProperty); // get the property for the class at cpIndex ! WXLUAMETHOD * LUACALL getLuaProperty(WXLUACLASS *pClass, const char *cpIndex, bool isSet); // get the derived method for the class cpIndex --- 434,440 ---- // get the method or 'get' property for the class at cpIndex ! WXLUAMETHOD * LUACALL getLuaMethod(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool &isProperty); // get the property for the class at cpIndex ! WXLUAMETHOD * LUACALL getLuaProperty(lua_State *L, const WXLUACLASS *pClass, const char *cpIndex, bool isSet); // get the derived method for the class cpIndex *************** *** 400,408 **** static void DumpGlobals(lua_State *lua_state); static void DumpTable(lua_State *lua_state, const wxString &tableName); ! static void DumpTable(lua_State *lua_state, int stackIndex); private: ! static void DumpType(lua_State *lua_state, const wxString &name, int index, wxString &outputbuffer); ! static wxString GetTableInfo(lua_State *lua_state, int index); static wxString MakeNumber(double dnum); static wxString GetUserDataInfo(lua_State *lua_state, int index); --- 488,496 ---- static void DumpGlobals(lua_State *lua_state); static void DumpTable(lua_State *lua_state, const wxString &tableName); ! static void DumpTable(lua_State *lua_state, int index, const wxString& tablename, wxHashTable& dumpList, int indent); private: ! static void DumpType(lua_State *lua_state, int index, wxString& type, wxString& value, wxString& info); ! static int GetTableInfo(lua_State *lua_state, int index, wxString& address, wxString& info); static wxString MakeNumber(double dnum); static wxString GetUserDataInfo(lua_State *lua_state, int index); *************** *** 417,421 **** // ---------------------------------------------------------------------------- ! class wxLuaFunction { public: --- 505,509 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaFunction { public: *************** *** 450,454 **** // Convert a 8-bit Lua String into wxString ! inline wxString lua2wx(const char * luastr) { if (luastr == NULL) --- 538,542 ---- // Convert a 8-bit Lua String into wxString ! inline WXDLLIMPEXP_WXLUA wxString lua2wx(const char * luastr) { if (luastr == NULL) *************** *** 459,463 **** // Convert a wxString to 8-bit Lua String ! inline const wxCharBuffer wx2lua(const wxString& wxstr) { wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); --- 547,551 ---- // Convert a wxString to 8-bit Lua String ! inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) { wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); *************** *** 466,470 **** // Convert a wxString to 8-bit Lua Buffer and store it ! class LuaCharBuffer { public: --- 554,558 ---- // Convert a wxString to 8-bit Lua Buffer and store it ! class WXDLLIMPEXP_WXLUA LuaCharBuffer { public: |
|
From: John L. <jr...@us...> - 2005-06-18 20:46:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp staktree.cpp Log Message: Updated to wxIDE's wrapper files Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** splttree.cpp 7 Jun 2005 04:17:40 -0000 1.2 --- splttree.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 238,246 **** UINT sbCode = SB_THUMBPOSITION; HWND vertScrollBar = 0; ! #if wxMINOR_VERSION < 5 MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); #else MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); ! #endif } #if USE_GENERIC_TREECTRL --- 238,246 ---- UINT sbCode = SB_THUMBPOSITION; HWND vertScrollBar = 0; ! #if !wxCHECK_VERSION(2,5,0) MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXHWND) vertScrollBar); #else MSWDefWindowProc((WXUINT) WM_VSCROLL, MAKELONG(sbCode, posVert), (WXLPARAM) vertScrollBar); ! #endif // wxCHECK_VERSION(2,5,0) } #if USE_GENERIC_TREECTRL Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** staktree.cpp 7 Jun 2005 04:17:40 -0000 1.2 --- staktree.cpp 18 Jun 2005 20:46:01 -0000 1.3 *************** *** 135,140 **** m_pServer->CleanupDebugReferences(); ! if (m_pServer != NULL) ! wxGetLuaHandler().SetStackFrame(NULL); } --- 135,140 ---- m_pServer->CleanupDebugReferences(); ! // if (m_pServer != NULL) ! // wxGetLuaHandler().SetStackFrame(NULL); } *************** *** 148,153 **** m_secondValueWindow = NULL; ! if (m_pServer != NULL) ! wxGetLuaHandler().SetStackFrame(this); m_stackComboBox = new wxComboBox( this, --- 148,153 ---- m_secondValueWindow = NULL; ! // if (m_pServer != NULL) ! // wxGetLuaHandler().SetStackFrame(this); m_stackComboBox = new wxComboBox( this, |
|
From: John L. <jr...@us...> - 2005-06-18 20:46:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/modules/wxlua/src Modified Files: internal.cpp interp.cpp library.cpp Log Message: Updated to wxIDE's wrapper files Index: interp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interp.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- interp.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 231,235 **** list->DeleteObject(win); ! wxPrintf(wxT("%d %d\n"), int(1), int(win)); fflush(stdout); node = list->GetFirst(); --- 231,235 ---- list->DeleteObject(win); ! //wxPrintf(wxT("%d %d\n"), int(1), int(win)); fflush(stdout); node = list->GetFirst(); *************** *** 380,384 **** } ! event.m_commandInt = (int)line; luaInterpreter->SendEvent( event ); } --- 380,384 ---- } ! event.SetInt((int)line); luaInterpreter->SendEvent( event ); } *************** *** 422,426 **** wxLuaEvent event(wxEVT_LUA_DEBUG_HOOK, luaInterpreter->GetId(), luaInterpreter); event.m_lua_Debug = LDebug; ! event.m_commandInt = LDebug->currentline; luaInterpreter->SendEvent( event ); if (event.m_stop_interpreter) --- 422,426 ---- wxLuaEvent event(wxEVT_LUA_DEBUG_HOOK, luaInterpreter->GetId(), luaInterpreter); event.m_lua_Debug = LDebug; ! event.SetInt(LDebug->currentline); luaInterpreter->SendEvent( event ); if (event.m_stop_interpreter) *************** *** 439,443 **** { luaInterpreter->SetLastLuaDebugHookTime( cur_time ); ! wxYieldIfNeeded(); } } --- 439,466 ---- { luaInterpreter->SetLastLuaDebugHookTime( cur_time ); ! ! bool painting = false; ! ! #if WXWIN_COMPATIBILITY_24 || !wxCHECK_VERSION(2, 5, 0) ! wxNode* node; ! #else ! wxHashTable::Node* node; ! #endif ! ! // FIXME - wxGTK crashes if wxYield[IfNeeded] is called within a paint handler? I think ! luaInterpreter->GetStateVariables()->m_pTrackedList->BeginFind(); ! node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next(); ! while (node) ! { ! if (wxDynamicCast(node->GetData(), wxPaintDC)) ! { ! painting = true; ! break; ! } ! node = luaInterpreter->GetStateVariables()->m_pTrackedList->Next(); ! } ! ! if (!painting) ! wxYieldIfNeeded(); } } *************** *** 453,456 **** --- 476,481 ---- DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_INIT) + DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUGGERATTACHED) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_SHUTDOWN) *************** *** 503,508 **** bool wxLuaInterpreter::Create(lua_State *inL, wxEvtHandler *handler, int id) { ! if (Ok() && !Destroy()) ! return FALSE; m_luaStateVariables = new wxLuaStateVariables; --- 528,533 ---- bool wxLuaInterpreter::Create(lua_State *inL, wxEvtHandler *handler, int id) { ! if (Ok() && !Destroy(true)) ! return false; m_luaStateVariables = new wxLuaStateVariables; *************** *** 548,558 **** } - // Load the wxWidgets libraries - RegisterWxLua(L); - // alert people that we've been created so they can finish setting us up wxLuaEvent event(wxEVT_LUA_CREATION, GetId(), this); SendEvent( event ); return TRUE; } --- 573,583 ---- } // alert people that we've been created so they can finish setting us up wxLuaEvent event(wxEVT_LUA_CREATION, GetId(), this); SendEvent( event ); + // now register bindings + m_luaStateVariables->RegisterBindings(m_lua_State, true); + return TRUE; } *************** *** 563,567 **** { m_evtHandler = NULL; // no events here, the handler may already be gone ! Destroy(TRUE); } --- 588,592 ---- { m_evtHandler = NULL; // no events here, the handler may already be gone ! Destroy(true); } *************** *** 569,572 **** --- 594,606 ---- } + void wxLuaInterpreter::GarbageCollectWindows(bool closeWindows) + { + // remove deleted windows + if (Ok() && + m_luaStateVariables->m_pWindowList && + m_luaStateVariables->m_pWindowList->GetCount()) + wxLuaCleanupWindows(m_luaStateVariables->m_pWindowList, !closeWindows); + } + bool wxLuaInterpreter::Destroy(bool force) { *************** *** 594,598 **** return FALSE; ! wxPrintf(wxT("Deleting windows\n")); // delete windows and their eventhandler since they delete the LuaCallbacks --- 628,632 ---- return FALSE; ! //wxPrintf(wxT("Deleting windows\n")); // delete windows and their eventhandler since they delete the LuaCallbacks *************** *** 624,640 **** m_evtHandler = evtHandler; } - wxEvtHandler *wxLuaInterpreter::GetEventHandler() const - { - return m_evtHandler; - } - - void wxLuaInterpreter::SetId(int id) - { - m_id = id; - } - int wxLuaInterpreter::GetId() const - { - return m_id; - } int wxLuaInterpreter::RunFile(const wxString &filename) --- 658,661 ---- *************** *** 707,715 **** } - bool wxLuaInterpreter::IsRunning() const - { - return m_is_running; - } - void wxLuaInterpreter::Break(const wxString &msg) { --- 728,731 ---- *************** *** 726,738 **** } - bool wxLuaInterpreter::GetBreak() const - { - return m_user_break; - } - wxString wxLuaInterpreter::GetBreakMessage() const - { - return m_break_msg; - } - void wxLuaInterpreter::SetLuaDebugHook(int count, int yield, bool send_debug_evt, int hook) { --- 742,745 ---- *************** *** 755,775 **** } - int wxLuaInterpreter::GetLuaDebugHookCount() const - { - return m_lua_debug_hook_count; - } - int wxLuaInterpreter::GetLuaDebugHookYield() const - { - return m_lua_debug_hook_yield; - } - bool wxLuaInterpreter::GetLuaDebugHookSendEvt() const - { - return m_lua_debug_hook_send_evt; - } - int wxLuaInterpreter::GetLuaDebugHook() const - { - return m_lua_debug_hook; - } - unsigned long wxLuaInterpreter::GetLastLuaDebugHookTime() const { --- 762,765 ---- *************** *** 810,814 **** wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); event.SetString(msg); ! event.m_commandInt = -1; // don't know what line the error occured SendEvent( event ); return FALSE; --- 800,804 ---- wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); event.SetString(msg); ! event.SetInt(-1); // don't know what line the error occured SendEvent( event ); return FALSE; Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** internal.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- internal.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- #include "wxlua/include/internal.h" #include "wxlua/include/callback.h" + #include "wxbind/include/wxbind.h" class wxStyledTextCtrlDocument; // for void* wxStyledTextCtrl::GetDocPointer() *************** *** 59,62 **** --- 60,70 ---- //#include "wxlua/include/library.h" [...1207 lines suppressed...] int eventClassTag = s_wxEvent; ! GET_LUASTATEVARS_RET(m_luaState) ! const WXLUAEVENT *pLuaEvent = stateVars->GetLuaEvent(pEvent); ! if (pLuaEvent) eventClassTag = *pLuaEvent->eventClassTag; *************** *** 2144,2148 **** default: if (newtop > top) ! errorMsg += lua2wx(lua_tostring(L, -1)); break; } --- 2385,2389 ---- default: if (newtop > top) ! errorMsg += wxT("\n") + lua2wx(lua_tostring(L, -1)); break; } Index: library.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/library.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** library.cpp 7 Jun 2005 04:17:39 -0000 1.2 --- library.cpp 18 Jun 2005 20:46:00 -0000 1.3 *************** *** 26,30 **** #include "wxlua/include/library.h" #include "wxlua/include/internal.h" - //#include "wxlua/include/dserver.h" // ---------------------------------------------------------------------------- --- 26,29 ---- |
|
From: John L. <jr...@us...> - 2005-06-18 20:46:09
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2914/wxLua/bindings Modified Files: wxluawrap.lua Log Message: Updated to wxIDE's wrapper files Index: wxluawrap.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluawrap.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluawrap.lua 7 Jun 2005 04:17:38 -0000 1.1 --- wxluawrap.lua 18 Jun 2005 20:45:58 -0000 1.2 *************** *** 558,562 **** -- returns 1 if all anded skip token directives return 1 ! -- (e.g %wxver24&%wxver25) function getSkipTokenAndValue(tokenStr) local item = splitLineByChar(tokenStr, "&") --- 558,562 ---- -- returns 1 if all anded skip token directives return 1 ! -- (e.g %wxchkver24&%wxchkver25) function getSkipTokenAndValue(tokenStr) local item = splitLineByChar(tokenStr, "&") *************** *** 580,584 **** -- returns 1 if an ored skip token directive returns 1 ! -- (e.g %wxver24|%wxver25) function getSkipTokenOrValue(tokenStr) local item = splitLineByChar(tokenStr, "|") --- 580,584 ---- -- returns 1 if an ored skip token directive returns 1 ! -- (e.g %wxchkver24|%wxchkver25) function getSkipTokenOrValue(tokenStr) local item = splitLineByChar(tokenStr, "|") *************** *** 1105,1124 **** -- we always have target in case we haven't added it to list skipToken[1] = {token = "%"..target, value = 1 } ! skipToken[2] = {token = "%wxver22", value = wxVer22 } ! skipToken[3] = {token = "%wxver23", value = wxVer23 } ! skipToken[4] = {token = "%wxver24", value = wxVer24 } ! skipToken[5] = {token = "%wxver25", value = wxVer25 } ! skipToken[6] = {token = "<wxver23", value = wxVer22 } if (wxVer23 == 1 or wxVer22 == 1) then ! skipToken[7] = {token = "<wxver24", value = 1 } else ! skipToken[7] = {token = "<wxver24", value = 0 } end if (wxVer24 == 1 or wxVer23 == 1 or wxVer22 == 1) then ! skipToken[8] = {token = "<wxver25", value = 1 } else ! skipToken[8] = {token = "<wxver25", value = 0 } end --- 1105,1124 ---- -- we always have target in case we haven't added it to list skipToken[1] = {token = "%"..target, value = 1 } ! skipToken[2] = {token = "%wxchkver22", value = wxVer22 } ! skipToken[3] = {token = "%wxchkver23", value = wxVer23 } ! skipToken[4] = {token = "%wxchkver24", value = wxVer24 } ! skipToken[5] = {token = "%wxchkver25", value = wxVer25 } ! skipToken[6] = {token = "<wxchkver23", value = wxVer22 } if (wxVer23 == 1 or wxVer22 == 1) then ! skipToken[7] = {token = "<wxchkver24", value = 1 } else ! skipToken[7] = {token = "<wxchkver24", value = 0 } end if (wxVer24 == 1 or wxVer23 == 1 or wxVer22 == 1) then ! skipToken[8] = {token = "<wxchkver25", value = 1 } else ! skipToken[8] = {token = "<wxchkver25", value = 0 } end *************** *** 1319,1323 **** if string.find(a, "%if", 1, 1) then a = trim(remove(a, "%if")) ! if setupTable[a] ~= 1 then print("Skipping %if: "..a) --- 1319,1324 ---- if string.find(a, "%if", 1, 1) then a = trim(remove(a, "%if")) ! local keep, processedLine, rettoken = processSkipTokenDirectives(a) ! if keep ~= 1 or setupTable[a] ~= 1 then print("Skipping %if: "..a) |
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:20
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps Modified Files: Makefile.in Log Message: Fixed modules compilation Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 14 Jun 2005 20:22:49 -0000 1.1 --- Makefile.in 14 Jun 2005 21:44:39 -0000 1.2 *************** *** 12,21 **** --- 12,25 ---- INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ + RESCOMP = @RESCOMP@ SETFILE = @SETFILE@ top_builddir = @top_builddir@ + CC = @CC@ CXX = @CXX@ + CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ + WX_CFLAGS = @WX_CFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ *************** *** 24,42 **** DESTDIR = WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ wxlua_wxlua.o \ ! wxlua_lconsole.o ### Conditionally set variables: ### ! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_PLATFORM_MAC_1@__wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) ### Targets: ### ! all: ../bin/wxlua$(EXEEXT) install: all --- 28,52 ---- DESTDIR = + WXLUA_CFLAGS = -I../modules $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ wxlua_wxlua.o \ ! wxlua_lconsole.o \ ! $(__wxlua___win32rc) \ ! wxlua_..\bindings\wxwidgets\wxluawrap.o ### Conditionally set variables: ### ! @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) + @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) + @COND_PLATFORM_WIN32_1@__wxlua___win32rc = wxlua_wxlua_rc.o ### Targets: ### ! all: wrap ../bin/wxlua$(EXEEXT) install: all *************** *** 54,67 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) $(__wxlua___mac_setfilecmd) ! wxlua_wxlua.o: ../wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/wxlua.cpp ! wxlua_lconsole.o: ../wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/lconsole.cpp --- 64,87 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) wrap $(__wxlua___win32rc) ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -llua $(__wxlua___mac_setfilecmd) ! wxlua_wxlua.o: ./wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp ! wxlua_lconsole.o: ./wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/lconsole.cpp ! ! wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc ! $(RESCOMP) -i$< -o$@ --include-dir ../modules ! ! wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c ! $(CCC) -c -o $@ $(WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c |
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:20
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.vc 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.vc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + # C++ compiler CXX = cl + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 46,49 **** --- 52,61 ---- ### Variables: ### + WXLUA_CFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \ + $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ + $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = /MD$(__DEBUGRUNTIME_7) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 54,58 **** WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj ### Conditionally set variables: ### --- 66,72 ---- WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res \ ! msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### *************** *** 64,70 **** --- 78,90 ---- __WXUNICODE_DEFINE_p = /D_UNICODE !endif + !if "$(WX_UNICODE)" == "1" + __WXUNICODE_DEFINE_p_1 = /d _UNICODE + !endif !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif + !if "$(WX_DEBUG)" == "1" + __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ + !endif !if "$(WX_DEBUG)" == "0" __WARNINGS_2 = /w *************** *** 98,101 **** --- 118,127 ---- !endif !if "$(WX_DEBUG)" == "0" + ____DEBUGRUNTIME_6_p_1 = + !endif + !if "$(WX_DEBUG)" == "1" + ____DEBUGRUNTIME_6_p_1 = /d _DEBUG + !endif + !if "$(WX_DEBUG)" == "0" __DEBUGRUNTIME_7 = !endif *************** *** 106,109 **** --- 132,138 ---- __WX_SHAREDDEFINE_p = /DWXUSINGDLL !endif + !if "$(WX_SHARED)" == "1" + __WX_SHAREDDEFINE_p_1 = /d WXUSINGDLL + !endif !if "$(WX_SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_lib *************** *** 135,139 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 164,168 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 145,157 **** -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_OBJECTS) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 << ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** --- 174,196 ---- -if exist ..\..\..\bin\wxlua.pdb del ..\..\..\bin\wxlua.pdb ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_5) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUA_OBJECTS) wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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 << ! msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc + rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include /i ..\..\..\modules $(____DEBUGRUNTIME_6_p_1) $(__WX_SHAREDDEFINE_p_1) $** + + msvc$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) /c /nologo /TC /Fo$@ $(WXLUA_CFLAGS) $** + Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.bcc 14 Jun 2005 20:22:47 -0000 1.2 --- makefile.bcc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 20,23 **** --- 20,28 ---- # ------------------------------------------------------------------------- + # C compiler + !ifndef CC + CC = bcc32 + !endif + # C++ compiler !ifndef CXX *************** *** 25,28 **** --- 30,38 ---- !endif + # Standard flags for CC + !ifndef CFLAGS + CFLAGS = + !endif + # Standard flags for C++ !ifndef CXXFLAGS *************** *** 73,76 **** --- 83,91 ---- ### Variables: ### + WXLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ + -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 80,84 **** WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj ### Conditionally set variables: ### --- 95,100 ---- WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### *************** *** 90,96 **** --- 106,118 ---- __WXUNICODE_DEFINE_p = -D_UNICODE !endif + !if "$(WX_UNICODE)" == "1" + __WXUNICODE_DEFINE_p_1 = -d_UNICODE + !endif !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif + !if "$(WX_DEBUG)" == "1" + __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ + !endif !if "$(WX_DEBUG)" == "0" __OPTIMIZEFLAG_1 = -O2 *************** *** 102,105 **** --- 124,130 ---- __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif + !if "$(WX_SHARED)" == "1" + __WX_SHAREDDEFINE_p_1 = -dWXUSINGDLL + !endif !if "$(WX_SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 137,141 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 162,166 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 150,162 **** -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(WXLUA_OBJECTS),$@,, wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** --- 175,197 ---- -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap borland$(WXLIBPOSTFIX)\wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\wxlua_wxlua.res | ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $** + + borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) -q -c -P- -o$@ $(WXLUA_CFLAGS) $** + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.wat 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.wat 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + # C++ compiler CXX = wpp386 + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 65,76 **** WX3RDPARTLIBPOSTFIX = d !endif - __WXUNICODE_DEFINE_p = - !ifeq WX_UNICODE 1 - __WXUNICODE_DEFINE_p = -d_UNICODE - !endif - __WXDEBUG_DEFINE_p = - !ifeq WX_DEBUG 1 - __WXDEBUG_DEFINE_p = -d__WXDEBUG__ - !endif __WARNINGS_0 = !ifeq WX_DEBUG 0 --- 71,74 ---- *************** *** 101,108 **** __DEBUGINFO_3 = debug all !endif - __WX_SHAREDDEFINE_p = - !ifeq WX_SHARED 1 - __WX_SHAREDDEFINE_p = -dWXUSINGDLL - !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq WX_SHARED 0 --- 99,102 ---- *************** *** 112,115 **** --- 106,117 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll !endif + __WXUNICODE_DEFINE_p = + !ifeq WX_UNICODE 1 + __WXUNICODE_DEFINE_p = -d_UNICODE + !endif + __WXDEBUG_DEFINE_p = + !ifeq WX_DEBUG 1 + __WXDEBUG_DEFINE_p = -d__WXDEBUG__ + !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 *************** *** 135,141 **** --- 137,152 ---- __WXLIBPATH_FILENAMES = \lib\wat_dll !endif + __WX_SHAREDDEFINE_p = + !ifeq WX_SHARED 1 + __WX_SHAREDDEFINE_p = -dWXUSINGDLL + !endif ### Variables: ### + WXLUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & + -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & + $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & + $(CFLAGS) WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & *************** *** 145,149 **** WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj --- 156,161 ---- WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj *************** *** 154,158 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua.exe clean : .SYMBOLIC --- 166,170 ---- ### Targets: ### ! all : .SYMBOLIC wrap ..\..\..\bin\wxlua.exe clean : .SYMBOLIC *************** *** 164,168 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet --- 176,184 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap : ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) wrap watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet *************** *** 171,182 **** @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc file %i ! @for %i in ( wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc wlink @watcom$(WXLIBPOSTFIX)\wxlua.lbc ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj : .AUTODEPEND ..\..\..\wxlua\src\wxlua.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj : .AUTODEPEND ..\..\..\wxlua\src\lconsole.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< --- 187,204 ---- @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).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) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\wxlua.lbc ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc + wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< + + watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c + $(CC) -zq -fo=$^@ $(WXLUA_CFLAGS) $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gcc 14 Jun 2005 20:22:48 -0000 1.2 --- makefile.gcc 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = gcc + # C++ compiler CXX = g++ + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 46,56 **** ### Variables: ### WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o ### Conditionally set variables: ### --- 52,68 ---- ### Variables: ### + WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ + -D__WXMSW__ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ + -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ + -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ ! -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o ### Conditionally set variables: ### *************** *** 62,68 **** --- 74,86 ---- __WXUNICODE_DEFINE_p = -D_UNICODE endif + ifeq ($(WX_UNICODE),1) + __WXUNICODE_DEFINE_p_1 = --define _UNICODE + endif ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif + ifeq ($(WX_DEBUG),1) + __WXDEBUG_DEFINE_p_1 = --define __WXDEBUG__ + endif ifeq ($(WX_DEBUG),0) __WARNINGS_0 = *************** *** 80,83 **** --- 98,104 ---- __WX_SHAREDDEFINE_p = -DWXUSINGDLL endif + ifeq ($(WX_SHARED),1) + __WX_SHAREDDEFINE_p_1 = --define WXUSINGDLL + endif ifeq ($(WX_SHARED),0) __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib *************** *** 102,109 **** endif ifeq ($(WX_SHARED),0) ! __WXLIBPATH_FILENAMES = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) ! __WXLIBPATH_FILENAMES = \lib\gcc_dll endif ifeq ($(WX_DEBUG),0) --- 123,130 ---- endif ifeq ($(WX_SHARED),0) ! WXLIBPATH = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) ! WXLIBPATH = \lib\gcc_dll endif ifeq ($(WX_DEBUG),0) *************** *** 121,125 **** ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: --- 142,146 ---- ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: *************** *** 127,139 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o: ../../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o: ../../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< .PHONY: all clean --- 148,170 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< + mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc + windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1) + + mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c + $(CC) -c -o $@ $(WXLUA_CFLAGS) $< + .PHONY: all clean |
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:20
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140 Modified Files: Makefile.in autoconf_inc.m4 Log Message: Fixed modules compilation Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/autoconf_inc.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** autoconf_inc.m4 14 Jun 2005 20:22:48 -0000 1.4 --- autoconf_inc.m4 14 Jun 2005 21:44:39 -0000 1.5 *************** *** 19,22 **** --- 19,40 ---- fi AC_SUBST(COND_DEPS_TRACKING_1) + dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[modules.bkl] ### + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" + if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) + dnl ### begin block 20_COND_PLATFORM_MACOSX_1[modules.bkl] ### + COND_PLATFORM_MACOSX_1="#" + if test "x$PLATFORM_MACOSX" = "x1" ; then + COND_PLATFORM_MACOSX_1="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1) + dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[modules.bkl] ### + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MAC_1[apps.bkl,modules.bkl,util.bkl] ### COND_PLATFORM_MAC_1="#" *************** *** 25,29 **** fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_USE_UTIL_1[util.bkl] ### COND_USE_UTIL_1="#" if test "x$USE_UTIL" = "x1" ; then --- 43,95 ---- fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[apps.bkl,modules.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) ! dnl ### begin block 20_COND_USE_BIN2C_1[util.bkl] ### ! COND_USE_BIN2C_1="#" ! if test "x$USE_BIN2C" = "x1" ; then ! COND_USE_BIN2C_1="" ! fi ! AC_SUBST(COND_USE_BIN2C_1) ! dnl ### begin block 20_COND_USE_SOSYMLINKS_1[modules.bkl] ### ! COND_USE_SOSYMLINKS_1="#" ! if test "x$USE_SOSYMLINKS" = "x1" ; then ! COND_USE_SOSYMLINKS_1="" ! fi ! AC_SUBST(COND_USE_SOSYMLINKS_1) ! dnl ### begin block 20_COND_USE_SOVERLINUX_1[modules.bkl] ### ! COND_USE_SOVERLINUX_1="#" ! if test "x$USE_SOVERLINUX" = "x1" ; then ! COND_USE_SOVERLINUX_1="" ! fi ! AC_SUBST(COND_USE_SOVERLINUX_1) ! dnl ### begin block 20_COND_USE_SOVERSION_0[modules.bkl] ### ! COND_USE_SOVERSION_0="#" ! if test "x$USE_SOVERSION" = "x0" ; then ! COND_USE_SOVERSION_0="" ! fi ! AC_SUBST(COND_USE_SOVERSION_0) ! dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[modules.bkl] ### ! COND_USE_SOVERSOLARIS_1="#" ! if test "x$USE_SOVERSOLARIS" = "x1" ; then ! COND_USE_SOVERSOLARIS_1="" ! fi ! AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[wxlua.bkl] ### COND_USE_UTIL_1="#" if test "x$USE_UTIL" = "x1" ; then *************** *** 37,38 **** --- 103,110 ---- fi AC_SUBST(COND_WX_SHARED_0) + dnl ### begin block 20_COND_WX_SHARED_1[modules.bkl] ### + COND_WX_SHARED_1="#" + if test "x$WX_SHARED" = "x1" ; then + COND_WX_SHARED_1="" + fi + AC_SUBST(COND_WX_SHARED_1) Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 12 Jun 2005 21:31:38 -0000 1.2 --- Makefile.in 14 Jun 2005 21:44:39 -0000 1.3 *************** *** 18,25 **** ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps install: all --- 18,27 ---- ### Conditionally set variables: ### + @COND_USE_UTIL_1@__utils___depname = utils + @COND_USE_APPS_1@__apps___depname = apps ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) install: all *************** *** 45,56 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! utils: ! (cd ./util/ && $(MAKE) ) modules: (cd ./modules/ && $(MAKE) ) ! apps: ! (cd ./apps/ && $(MAKE) ) --- 47,58 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_UTIL_1@utils: ! @COND_USE_UTIL_1@ (cd ./util/ && $(MAKE) ) modules: (cd ./modules/ && $(MAKE) ) ! @COND_USE_APPS_1@apps: ! @COND_USE_APPS_1@ (cd ./apps/ && $(MAKE) ) |
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:20
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps/wxlua/src Modified Files: wxlua.cpp Log Message: Fixed modules compilation Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.cpp 7 Jun 2005 04:17:29 -0000 1.1 --- wxlua.cpp 14 Jun 2005 21:44:39 -0000 1.2 *************** *** 226,230 **** { #ifdef __WXMSW__ ! if ((m_pConsole == NULL) && (strlen(argv[idx]) == 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('c'))) { wxLuaConsole *pConsole = new wxLuaConsole(this, m_luaState); --- 226,230 ---- { #ifdef __WXMSW__ ! if ((m_pConsole == NULL) && (wxStrlen(argv[idx]) == 2) && (argv[idx][0] == wxT('-')) && (argv[idx][1] == wxT('c'))) { wxLuaConsole *pConsole = new wxLuaConsole(this, m_luaState); |
|
From: Francesco <fr...@us...> - 2005-06-14 21:45:19
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/apps/build/bakefiles Modified Files: apps.bkl Log Message: Fixed modules compilation Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.bkl 12 Jun 2005 21:21:10 -0000 1.1 --- apps.bkl 14 Jun 2005 21:44:39 -0000 1.2 *************** *** 16,23 **** --- 16,25 ---- <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">..$(DIRSEP)..$(DIRSEP)..</set> + <set var="WXLUA_APPSDIR">..$(DIRSEP)..</set> </if> <if cond="TARGETING_WIN32=='0'"> <!-- Unix makefiles will be put in the main folder --> <set var="WXLUA_BASEDIR">..</set> + <set var="WXLUA_APPSDIR">.</set> </if> *************** *** 30,34 **** <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir --> ! <set var="SRCDIR">$(WXLUA_BASEDIR)</set> <include file="sources.bkl"/> --- 32,36 ---- <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir --> ! <set var="SRCDIR">$(WXLUA_APPSDIR)</set> <include file="sources.bkl"/> *************** *** 38,52 **** <!-- The WXLUA application target --> <!-- --> <exe id="wxlua" template="wxlua"> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> <!-- Libraries must be put in the right order ! --> <wx-lib>adv</wx-lib> <wx-lib>xml</wx-lib> <wx-lib>core</wx-lib> ! <wx-lib>base</wx-lib> </exe> --- 40,71 ---- <!-- The WXLUA application target --> <!-- --> + + <action id="wrap"> + <dependency-of>all</dependency-of> + <depends-on-file>..\..\..\bindings\wxwidgets\override.hpp</depends-on-file> + <command>..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua</command> + <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command> + </action> <exe id="wxlua" template="wxlua"> + <depends>wrap</depends> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> + <win32-res>wxlua/src/wxlua.rc</win32-res> + + <!-- here we handle the --> + <sources>..\bindings\wxwidgets\wxluawrap.c</sources> + <!-- Libraries must be put in the right order ! --> + <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxluasocket</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>lua</wxlua-lib> <wx-lib>adv</wx-lib> <wx-lib>xml</wx-lib> <wx-lib>core</wx-lib> ! <wx-lib>base</wx-lib> </exe> |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.vc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.vc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 31,44 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 52,72 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### + !if "$(USE_UTIL)" == "1" + __utils___depname = utils + !endif + !if "$(USE_APPS)" == "1" + __apps___depname = apps + !endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 56,63 **** --- 84,93 ---- cd $(MAKEDIR) + !if "$(USE_UTIL)" == "1" utils: cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) + !endif modules: *************** *** 66,72 **** --- 96,104 ---- cd $(MAKEDIR) + !if "$(USE_APPS)" == "1" apps: cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.bcc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 75,81 **** !endif ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! !ifndef USE_UTIL ! USE_UTIL = 1 !endif --- 75,81 ---- !endif ! # Does the wxLua utilities should be compiled ? [0,1] ! !ifndef USE_BIN2C ! USE_BIN2C = 1 !endif *************** *** 90,93 **** --- 90,103 ---- !endif + # Does the wxLua utilities should be compiled ? [0,1] + !ifndef USE_UTIL + USE_UTIL = 1 + !endif + + # Does the wxLua applications should be compiled ? [0,1] + !ifndef USE_APPS + USE_APPS = 1 + !endif + *************** *** 102,116 **** -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_UTIL="$(USE_UTIL)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 112,133 ---- -DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \ -DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \ ! -DWX_VERSION="$(WX_VERSION)" -DUSE_BIN2C="$(USE_BIN2C)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_UTIL="$(USE_UTIL)" \ ! -DUSE_APPS="$(USE_APPS)" ### Conditionally set variables: ### + !if "$(USE_UTIL)" == "1" + __utils___depname = utils + !endif + !if "$(USE_APPS)" == "1" + __apps___depname = apps + !endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 131,134 **** --- 148,152 ---- @del apps.bat + !if "$(USE_UTIL)" == "1" utils: @echo cd ..\..\util\build\msw >utils.bat *************** *** 136,139 **** --- 154,158 ---- call utils.bat @del utils.bat + !endif modules: *************** *** 143,146 **** --- 162,166 ---- @del modules.bat + !if "$(USE_APPS)" == "1" apps: @echo cd ..\..\apps\build\msw >apps.bat *************** *** 148,150 **** --- 168,171 ---- call apps.bat @del apps.bat + !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.wat 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.wat 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(%WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 43,46 **** --- 64,75 ---- ### Conditionally set variables: ### + __utils___depname = + !ifeq USE_UTIL 1 + __utils___depname = utils + !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps + !endif ### Variables: ### *************** *** 49,59 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Targets: ### ! all : .SYMBOLIC utils modules apps clean : .SYMBOLIC --- 78,89 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" & WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" & ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Targets: ### ! all : .SYMBOLIC $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC *************** *** 73,80 **** --- 103,112 ---- cd $(WATCOM_CWD) + !ifeq USE_UTIL 1 utils : .SYMBOLIC cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) + !endif modules : .SYMBOLIC *************** *** 83,89 **** --- 115,123 ---- cd $(WATCOM_CWD) + !ifeq USE_APPS 1 apps : .SYMBOLIC cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) + !endif Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.gcc 12 Jun 2005 21:31:38 -0000 1.3 --- makefile.gcc 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- # ------------------------------------------------------------------------- + # The directory where wxWidgets library is installed + WX_DIR = $(WXWIN) + # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 *************** *** 20,23 **** --- 23,44 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_BIN2C = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + + # Does the wxLua socket support need to be compiled ? [0,1] + USE_WXLUASOCKET = 1 + + # Does the wxLua utilities should be compiled ? [0,1] + USE_UTIL = 1 + + # Does the wxLua applications should be compiled ? [0,1] + USE_APPS = 1 + *************** *** 31,44 **** CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" ### Conditionally set variables: ### ### Targets: ### ! all: utils modules apps clean: --- 52,72 ---- CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ ! WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### + ifeq ($(USE_UTIL),1) + __utils___depname = utils + endif + ifeq ($(USE_APPS),1) + __apps___depname = apps + endif ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: *************** *** 48,59 **** --- 76,91 ---- $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean + ifeq ($(USE_UTIL),1) utils: $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) + endif modules: $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) + ifeq ($(USE_APPS),1) apps: $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) + endif .PHONY: all clean utils modules apps |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/util Modified Files: Makefile.in Log Message: Fixed modules compilation Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 12 Jun 2005 21:21:11 -0000 1.1 --- Makefile.in 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 30,34 **** @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_USE_UTIL_1@__bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__bin2c___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) --- 30,34 ---- @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_USE_BIN2C_1@__bin2c___depname = ./../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__bin2c___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) *************** *** 52,59 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_UTIL_1@./../bin/bin2c$(EXEEXT): $(BIN2C_OBJECTS) ! @COND_USE_UTIL_1@ $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) ! @COND_USE_UTIL_1@ ! @COND_USE_UTIL_1@ $(__bin2c___mac_setfilecmd) bin2c_bin2c.o: ./bin2c/bin2c.c --- 52,59 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_BIN2C_1@./../bin/bin2c$(EXEEXT): $(BIN2C_OBJECTS) ! @COND_USE_BIN2C_1@ $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) ! @COND_USE_BIN2C_1@ ! @COND_USE_BIN2C_1@ $(__bin2c___mac_setfilecmd) bin2c_bin2c.o: ./bin2c/bin2c.c |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.vc 14 Jun 2005 20:11:51 -0000 1.1 --- makefile.vc 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 54,57 **** --- 54,78 ---- LUA_LIB_CFLAGS = /MD /DWIN32 /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\lua_lib_lapi.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lcode.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ldebug.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ldo.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ldump.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lfunc.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lgc.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_llex.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lmem.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lobject.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lparser.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lstate.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lstring.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ltable.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ltests.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_ltm.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lundump.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lvm.obj \ + msvc$(WXLIBPOSTFIX)\lua_lib_lzio.obj \ msvc$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj \ msvc$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj \ *************** *** 64,88 **** LUA_CFLAGS = /MD /DWIN32 /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ - msvc$(WXLIBPOSTFIX)\lua_lapi.obj \ - msvc$(WXLIBPOSTFIX)\lua_lcode.obj \ - msvc$(WXLIBPOSTFIX)\lua_ldebug.obj \ - msvc$(WXLIBPOSTFIX)\lua_ldllmain.obj \ - msvc$(WXLIBPOSTFIX)\lua_ldo.obj \ - msvc$(WXLIBPOSTFIX)\lua_ldump.obj \ - msvc$(WXLIBPOSTFIX)\lua_lfunc.obj \ - msvc$(WXLIBPOSTFIX)\lua_lgc.obj \ - msvc$(WXLIBPOSTFIX)\lua_llex.obj \ - msvc$(WXLIBPOSTFIX)\lua_lmem.obj \ - msvc$(WXLIBPOSTFIX)\lua_lobject.obj \ - msvc$(WXLIBPOSTFIX)\lua_lopcodes.obj \ - msvc$(WXLIBPOSTFIX)\lua_lparser.obj \ - msvc$(WXLIBPOSTFIX)\lua_lstate.obj \ - msvc$(WXLIBPOSTFIX)\lua_lstring.obj \ - msvc$(WXLIBPOSTFIX)\lua_ltable.obj \ - msvc$(WXLIBPOSTFIX)\lua_ltests.obj \ - msvc$(WXLIBPOSTFIX)\lua_ltm.obj \ - msvc$(WXLIBPOSTFIX)\lua_lundump.obj \ - msvc$(WXLIBPOSTFIX)\lua_lvm.obj \ - msvc$(WXLIBPOSTFIX)\lua_lzio.obj \ msvc$(WXLIBPOSTFIX)\lua_lua.obj WXLUA_LIB_CXXFLAGS = /MD$(__DEBUGRUNTIME) /DWIN32 $(__WXUNICODE_DEFINE_p) \ --- 85,88 ---- *************** *** 336,425 **** !endif ! msvc$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj: ..\..\lua\src\lib\lbaselib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldblib.obj: ..\..\lua\src\lib\ldblib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_liolib.obj: ..\..\lua\src\lib\liolib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj: ..\..\lua\src\lib\lmathlib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_loadlib.obj: ..\..\lua\src\lib\loadlib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj: ..\..\lua\src\lib\lstrlib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ltablib.obj: ..\..\lua\src\lib\ltablib.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lapi.obj: ..\..\lua\src\lapi.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lcode.obj: ..\..\lua\src\lcode.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ldebug.obj: ..\..\lua\src\ldebug.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ldllmain.obj: ..\..\lua\src\ldllmain.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ldo.obj: ..\..\lua\src\ldo.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ldump.obj: ..\..\lua\src\ldump.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lfunc.obj: ..\..\lua\src\lfunc.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lgc.obj: ..\..\lua\src\lgc.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_llex.obj: ..\..\lua\src\llex.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lmem.obj: ..\..\lua\src\lmem.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lobject.obj: ..\..\lua\src\lobject.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lopcodes.obj: ..\..\lua\src\lopcodes.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lparser.obj: ..\..\lua\src\lparser.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lstate.obj: ..\..\lua\src\lstate.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lstring.obj: ..\..\lua\src\lstring.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ltable.obj: ..\..\lua\src\ltable.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ltests.obj: ..\..\lua\src\ltests.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_ltm.obj: ..\..\lua\src\ltm.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lundump.obj: ..\..\lua\src\lundump.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lvm.obj: ..\..\lua\src\lvm.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lzio.obj: ..\..\lua\src\lzio.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) $** msvc$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c --- 336,425 ---- !endif ! msvc$(WXLIBPOSTFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lcode.obj: ..\..\lua\src\lcode.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldebug.obj: ..\..\lua\src\ldebug.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldo.obj: ..\..\lua\src\ldo.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldump.obj: ..\..\lua\src\ldump.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lfunc.obj: ..\..\lua\src\lfunc.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lgc.obj: ..\..\lua\src\lgc.c $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_llex.obj: ..\..\lua\src\llex.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lmem.obj: ..\..\lua\src\lmem.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lobject.obj: ..\..\lua\src\lobject.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj: ..\..\lua\src\lopcodes.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lparser.obj: ..\..\lua\src\lparser.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lstate.obj: ..\..\lua\src\lstate.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lstring.obj: ..\..\lua\src\lstring.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ltable.obj: ..\..\lua\src\ltable.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ltests.obj: ..\..\lua\src\ltests.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ltm.obj: ..\..\lua\src\ltm.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lundump.obj: ..\..\lua\src\lundump.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lvm.obj: ..\..\lua\src\lvm.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lzio.obj: ..\..\lua\src\lzio.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj: ..\..\lua\src\lib\lbaselib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ldblib.obj: ..\..\lua\src\lib\ldblib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_liolib.obj: ..\..\lua\src\lib\liolib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj: ..\..\lua\src\lib\lmathlib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_loadlib.obj: ..\..\lua\src\lib\loadlib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj: ..\..\lua\src\lib\lstrlib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** ! msvc$(WXLIBPOSTFIX)\lua_lib_ltablib.obj: ..\..\lua\src\lib\ltablib.c ! $(CC) /c /nologo /TC /Fo$@ $(LUA_LIB_CFLAGS) $** msvc$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 12 Jun 2005 22:09:13 -0000 1.3 --- makefile.bcc 14 Jun 2005 21:44:41 -0000 1.4 *************** *** 70,73 **** --- 70,78 ---- !endif + # Version of the wx library to build against. + !ifndef WX_VERSION + WX_VERSION = 26 + !endif + *************** *** 80,83 **** --- 85,109 ---- LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\lua_lib_lapi.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lcode.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ldebug.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ldo.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ldump.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lfunc.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lgc.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_llex.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lmem.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lobject.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lparser.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lstate.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lstring.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ltable.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ltests.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_ltm.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lundump.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lvm.obj \ + borland$(WXLIBPOSTFIX)\lua_lib_lzio.obj \ borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj \ borland$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj \ *************** *** 90,156 **** LUA_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ - borland$(WXLIBPOSTFIX)\lua_lapi.obj \ - borland$(WXLIBPOSTFIX)\lua_lcode.obj \ - borland$(WXLIBPOSTFIX)\lua_ldebug.obj \ - borland$(WXLIBPOSTFIX)\lua_ldllmain.obj \ - borland$(WXLIBPOSTFIX)\lua_ldo.obj \ - borland$(WXLIBPOSTFIX)\lua_ldump.obj \ - borland$(WXLIBPOSTFIX)\lua_lfunc.obj \ - borland$(WXLIBPOSTFIX)\lua_lgc.obj \ - borland$(WXLIBPOSTFIX)\lua_llex.obj \ - borland$(WXLIBPOSTFIX)\lua_lmem.obj \ - borland$(WXLIBPOSTFIX)\lua_lobject.obj \ - borland$(WXLIBPOSTFIX)\lua_lopcodes.obj \ - borland$(WXLIBPOSTFIX)\lua_lparser.obj \ - borland$(WXLIBPOSTFIX)\lua_lstate.obj \ - borland$(WXLIBPOSTFIX)\lua_lstring.obj \ - borland$(WXLIBPOSTFIX)\lua_ltable.obj \ - borland$(WXLIBPOSTFIX)\lua_ltests.obj \ - borland$(WXLIBPOSTFIX)\lua_ltm.obj \ - borland$(WXLIBPOSTFIX)\lua_lundump.obj \ - borland$(WXLIBPOSTFIX)\lua_lvm.obj \ - borland$(WXLIBPOSTFIX)\lua_lzio.obj \ borland$(WXLIBPOSTFIX)\lua_lua.obj ! WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxlua_internal.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_interp.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_library.obj ### Conditionally set variables: ### !if "$(WX_SHARED)" == "0" ! __wxlua___depname = ..\..\..\lib\bcc_lib\wxlua.lib !endif ! !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" ! __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" ! __OPTIMIZEFLAG_1 = -O2 !endif ! !if "$(WX_DEBUG)" == "1" ! __OPTIMIZEFLAG_1 = -Od !endif ! !if "$(WX_DEBUG)" == "0" ! __DEBUGINFO_2 = -v- !endif !if "$(WX_DEBUG)" == "1" ! __DEBUGINFO_2 = -v ! !endif ! !if "$(WX_SHARED)" == "1" ! __WX_SHAREDDEFINE_p = -DWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 116,211 ---- LUA_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\lua_lua.obj ! WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_interp.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_library.obj ! WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUAMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_DLL_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj ! WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_DLL_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUASOCKET_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj ! WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG) $(__DEBUGINFO) -tWM \ ! $(__WX_SHAREDDEFINE_p) -DA2DWXLUASOCKETMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) ! WXLUASOCKET_DLL_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj ### Conditionally set variables: ### + !if "$(WX_DEBUG)" == "1" + WX3RDPARTLIBPOSTFIX = d + !endif !if "$(WX_SHARED)" == "0" ! __wxlua_lib___depname = ..\..\..\lib\bcc_lib\wxlua.lib !endif ! !if "$(WX_SHARED)" == "1" ! __wxlua_dll___depname = ..\..\..\lib\bcc_dll\wxlua_dll.dll !endif ! !if "$(WX_SHARED)" == "0" ! __wxluadebug_lib___depname = ..\..\..\lib\bcc_lib\wxluadebug.lib ! !endif ! !if "$(WX_SHARED)" == "1" ! __wxluadebug_dll___depname = ..\..\..\lib\bcc_dll\wxluadebug_dll.dll !endif !if "$(WX_SHARED)" == "0" ! __wxluasocket_lib___depname = ..\..\..\lib\bcc_lib\wxluasocket.lib !endif !if "$(WX_SHARED)" == "1" ! __wxluasocket_dll___depname = ..\..\..\lib\bcc_dll\wxluasocket_dll.dll !endif ! !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib !endif ! !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 163,166 **** --- 218,242 ---- WXLIBPOSTFIX = ud !endif + !if "$(WX_DEBUG)" == "0" + __OPTIMIZEFLAG = -O2 + !endif + !if "$(WX_DEBUG)" == "1" + __OPTIMIZEFLAG = -Od + !endif + !if "$(WX_SHARED)" == "1" + __WX_SHAREDDEFINE_p = -DWXUSINGDLL + !endif + !if "$(WX_SHARED)" == "0" + __WXLIBPATH_FILENAMES = \lib\bcc_lib + !endif + !if "$(WX_SHARED)" == "1" + __WXLIBPATH_FILENAMES = \lib\bcc_dll + !endif + !if "$(WX_DEBUG)" == "0" + __DEBUGINFO = -v- + !endif + !if "$(WX_DEBUG)" == "1" + __DEBUGINFO = -v + !endif *************** *** 171,175 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua___depname) clean: --- 247,251 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib ..\..\..\lib\bcc_dll ..\..\..\lib\bcc_lib\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 185,188 **** --- 261,287 ---- -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils -if exist ..\..\..\lib\bcc_lib\wxlua.lib del ..\..\..\lib\bcc_lib\wxlua.lib + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.dll del ..\..\..\lib\bcc_dll\wxlua_dll.dll + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.tds del ..\..\..\lib\bcc_dll\wxlua_dll.tds + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ilc del ..\..\..\lib\bcc_dll\wxlua_dll.ilc + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ild del ..\..\..\lib\bcc_dll\wxlua_dll.ild + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ilf del ..\..\..\lib\bcc_dll\wxlua_dll.ilf + -if exist ..\..\..\lib\bcc_dll\wxlua_dll.ils del ..\..\..\lib\bcc_dll\wxlua_dll.ils + -if exist ..\..\..\lib\bcc_dll\wxlua.lib del ..\..\..\lib\bcc_dll\wxlua.lib + -if exist ..\..\..\lib\bcc_lib\wxluadebug.lib del ..\..\..\lib\bcc_lib\wxluadebug.lib + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll\wxluadebug_dll.dll + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.tds del ..\..\..\lib\bcc_dll\wxluadebug_dll.tds + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.ilc del ..\..\..\lib\bcc_dll\wxluadebug_dll.ilc + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.ild del ..\..\..\lib\bcc_dll\wxluadebug_dll.ild + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.ilf del ..\..\..\lib\bcc_dll\wxluadebug_dll.ilf + -if exist ..\..\..\lib\bcc_dll\wxluadebug_dll.ils del ..\..\..\lib\bcc_dll\wxluadebug_dll.ils + -if exist ..\..\..\lib\bcc_dll\wxluadebug.lib del ..\..\..\lib\bcc_dll\wxluadebug.lib + -if exist ..\..\..\lib\bcc_lib\wxluasocket.lib del ..\..\..\lib\bcc_lib\wxluasocket.lib + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.dll del ..\..\..\lib\bcc_dll\wxluasocket_dll.dll + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.tds del ..\..\..\lib\bcc_dll\wxluasocket_dll.tds + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.ilc del ..\..\..\lib\bcc_dll\wxluasocket_dll.ilc + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.ild del ..\..\..\lib\bcc_dll\wxluasocket_dll.ild + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.ilf del ..\..\..\lib\bcc_dll\wxluasocket_dll.ilf + -if exist ..\..\..\lib\bcc_dll\wxluasocket_dll.ils del ..\..\..\lib\bcc_dll\wxluasocket_dll.ils + -if exist ..\..\..\lib\bcc_dll\wxluasocket.lib del ..\..\..\lib\bcc_dll\wxluasocket.lib ..\..\..\lib\bcc_lib: *************** *** 204,214 **** !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib\wxlua.lib: $(WXLUA_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(WXLUA_OBJECTS) | !endif borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** --- 303,416 ---- !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib\wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(WXLUA_LIB_OBJECTS) ! | ! !endif ! ! !if "$(WX_SHARED)" == "1" ! ..\..\..\lib\bcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, | + implib -f ..\..\..\lib\bcc_dll\wxlua $@ !endif + !if "$(WX_SHARED)" == "0" + ..\..\..\lib\bcc_lib\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXLUADEBUG_LIB_OBJECTS) + | + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\bcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| + c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, + | + implib -f ..\..\..\lib\bcc_dll\wxluadebug $@ + !endif + + !if "$(WX_SHARED)" == "0" + ..\..\..\lib\bcc_lib\wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXLUASOCKET_LIB_OBJECTS) + | + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\bcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| + c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, + | + implib -f ..\..\..\lib\bcc_dll\wxluasocket $@ + !endif + + borland$(WXLIBPOSTFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lcode.obj: ..\..\lua\src\lcode.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ldebug.obj: ..\..\lua\src\ldebug.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ldo.obj: ..\..\lua\src\ldo.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ldump.obj: ..\..\lua\src\ldump.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lfunc.obj: ..\..\lua\src\lfunc.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lgc.obj: ..\..\lua\src\lgc.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_llex.obj: ..\..\lua\src\llex.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lmem.obj: ..\..\lua\src\lmem.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lobject.obj: ..\..\lua\src\lobject.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj: ..\..\lua\src\lopcodes.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lparser.obj: ..\..\lua\src\lparser.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lstate.obj: ..\..\lua\src\lstate.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lstring.obj: ..\..\lua\src\lstring.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ltable.obj: ..\..\lua\src\ltable.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ltests.obj: ..\..\lua\src\ltests.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_ltm.obj: ..\..\lua\src\ltm.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lundump.obj: ..\..\lua\src\lundump.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lvm.obj: ..\..\lua\src\lvm.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\lua_lib_lzio.obj: ..\..\lua\src\lzio.c + $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** + borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** *************** *** 235,311 **** $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lapi.obj: ..\..\lua\src\lapi.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_lcode.obj: ..\..\lua\src\lcode.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_ldebug.obj: ..\..\lua\src\ldebug.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_ldllmain.obj: ..\..\lua\src\ldllmain.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_ldo.obj: ..\..\lua\src\ldo.c $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_ldump.obj: ..\..\lua\src\ldump.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lfunc.obj: ..\..\lua\src\lfunc.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lgc.obj: ..\..\lua\src\lgc.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_llex.obj: ..\..\lua\src\llex.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lmem.obj: ..\..\lua\src\lmem.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lobject.obj: ..\..\lua\src\lobject.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lopcodes.obj: ..\..\lua\src\lopcodes.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lparser.obj: ..\..\lua\src\lparser.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lstate.obj: ..\..\lua\src\lstate.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lstring.obj: ..\..\lua\src\lstring.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_ltable.obj: ..\..\lua\src\ltable.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_ltests.obj: ..\..\lua\src\ltests.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_ltm.obj: ..\..\lua\src\ltm.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lundump.obj: ..\..\lua\src\lundump.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lvm.obj: ..\..\lua\src\lvm.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lzio.obj: ..\..\lua\src\lzio.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_internal.obj: ..\..\wxlua\src\internal.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_interp.obj: ..\..\wxlua\src\interp.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_library.obj: ..\..\wxlua\src\library.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** --- 437,501 ---- $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj: ..\..\wxlua\src\internal.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lib_interp.obj: ..\..\wxlua\src\interp.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lib_library.obj: ..\..\wxlua\src\library.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj: ..\..\wxlua\src\internal.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_dll_interp.obj: ..\..\wxlua\src\interp.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_dll_library.obj: ..\..\wxlua\src\library.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj: ..\..\wxluadebug\src\splttree.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj: ..\..\wxluadebug\src\staktree.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj: ..\..\wxluadebug\src\debug.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj: ..\..\wxluadebug\src\splttree.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj: ..\..\wxluadebug\src\staktree.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.obj: ..\..\wxluasocket\src\debugio.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.obj: ..\..\wxluasocket\src\dserver.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_socket.obj: ..\..\wxluasocket\src\socket.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.obj: ..\..\wxluasocket\src\debugio.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.obj: ..\..\wxluasocket\src\dserver.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.obj: ..\..\wxluasocket\src\dtarget.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_socket.obj: ..\..\wxluasocket\src\socket.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.wat 14 Jun 2005 20:11:51 -0000 1.1 --- makefile.wat 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 170,173 **** --- 170,194 ---- LUA_LIB_CFLAGS = -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = & + watcom$(WXLIBPOSTFIX)\lua_lib_lapi.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lcode.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ldebug.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ldo.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ldump.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lfunc.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lgc.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_llex.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lmem.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lobject.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lparser.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lstate.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lstring.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ltable.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ltests.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_ltm.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lundump.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lvm.obj & + watcom$(WXLIBPOSTFIX)\lua_lib_lzio.obj & watcom$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj & watcom$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj & *************** *** 180,204 **** LUA_CFLAGS = -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = & - watcom$(WXLIBPOSTFIX)\lua_lapi.obj & - watcom$(WXLIBPOSTFIX)\lua_lcode.obj & - watcom$(WXLIBPOSTFIX)\lua_ldebug.obj & - watcom$(WXLIBPOSTFIX)\lua_ldllmain.obj & - watcom$(WXLIBPOSTFIX)\lua_ldo.obj & - watcom$(WXLIBPOSTFIX)\lua_ldump.obj & - watcom$(WXLIBPOSTFIX)\lua_lfunc.obj & - watcom$(WXLIBPOSTFIX)\lua_lgc.obj & - watcom$(WXLIBPOSTFIX)\lua_llex.obj & - watcom$(WXLIBPOSTFIX)\lua_lmem.obj & - watcom$(WXLIBPOSTFIX)\lua_lobject.obj & - watcom$(WXLIBPOSTFIX)\lua_lopcodes.obj & - watcom$(WXLIBPOSTFIX)\lua_lparser.obj & - watcom$(WXLIBPOSTFIX)\lua_lstate.obj & - watcom$(WXLIBPOSTFIX)\lua_lstring.obj & - watcom$(WXLIBPOSTFIX)\lua_ltable.obj & - watcom$(WXLIBPOSTFIX)\lua_ltests.obj & - watcom$(WXLIBPOSTFIX)\lua_ltm.obj & - watcom$(WXLIBPOSTFIX)\lua_lundump.obj & - watcom$(WXLIBPOSTFIX)\lua_lvm.obj & - watcom$(WXLIBPOSTFIX)\lua_lzio.obj & watcom$(WXLIBPOSTFIX)\lua_lua.obj WXLUA_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 201,204 ---- *************** *** 371,460 **** !endif ! watcom$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj : .AUTODEPEND ..\..\lua\src\lib\lauxlib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj : .AUTODEPEND ..\..\lua\src\lib\lbaselib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldblib.obj : .AUTODEPEND ..\..\lua\src\lib\ldblib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_liolib.obj : .AUTODEPEND ..\..\lua\src\lib\liolib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj : .AUTODEPEND ..\..\lua\src\lib\lmathlib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_loadlib.obj : .AUTODEPEND ..\..\lua\src\lib\loadlib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj : .AUTODEPEND ..\..\lua\src\lib\lstrlib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ltablib.obj : .AUTODEPEND ..\..\lua\src\lib\ltablib.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lcode.obj : .AUTODEPEND ..\..\lua\src\lcode.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ldebug.obj : .AUTODEPEND ..\..\lua\src\ldebug.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ldllmain.obj : .AUTODEPEND ..\..\lua\src\ldllmain.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ldo.obj : .AUTODEPEND ..\..\lua\src\ldo.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ldump.obj : .AUTODEPEND ..\..\lua\src\ldump.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lfunc.obj : .AUTODEPEND ..\..\lua\src\lfunc.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lgc.obj : .AUTODEPEND ..\..\lua\src\lgc.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_llex.obj : .AUTODEPEND ..\..\lua\src\llex.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lmem.obj : .AUTODEPEND ..\..\lua\src\lmem.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lobject.obj : .AUTODEPEND ..\..\lua\src\lobject.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lopcodes.obj : .AUTODEPEND ..\..\lua\src\lopcodes.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lparser.obj : .AUTODEPEND ..\..\lua\src\lparser.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lstate.obj : .AUTODEPEND ..\..\lua\src\lstate.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lstring.obj : .AUTODEPEND ..\..\lua\src\lstring.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ltable.obj : .AUTODEPEND ..\..\lua\src\ltable.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ltests.obj : .AUTODEPEND ..\..\lua\src\ltests.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_ltm.obj : .AUTODEPEND ..\..\lua\src\ltm.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lundump.obj : .AUTODEPEND ..\..\lua\src\lundump.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lvm.obj : .AUTODEPEND ..\..\lua\src\lvm.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lzio.obj : .AUTODEPEND ..\..\lua\src\lzio.c ! $(CC) -zq -fo=$^@ $(LUA_CFLAGS) $< watcom$(WXLIBPOSTFIX)\lua_lua.obj : .AUTODEPEND ..\..\lua\src\lua\lua.c --- 371,460 ---- !endif ! watcom$(WXLIBPOSTFIX)\lua_lib_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lcode.obj : .AUTODEPEND ..\..\lua\src\lcode.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldebug.obj : .AUTODEPEND ..\..\lua\src\ldebug.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj : .AUTODEPEND ..\..\lua\src\ldllmain.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldo.obj : .AUTODEPEND ..\..\lua\src\ldo.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldump.obj : .AUTODEPEND ..\..\lua\src\ldump.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lfunc.obj : .AUTODEPEND ..\..\lua\src\lfunc.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lgc.obj : .AUTODEPEND ..\..\lua\src\lgc.c $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_llex.obj : .AUTODEPEND ..\..\lua\src\llex.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lmem.obj : .AUTODEPEND ..\..\lua\src\lmem.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lobject.obj : .AUTODEPEND ..\..\lua\src\lobject.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj : .AUTODEPEND ..\..\lua\src\lopcodes.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lparser.obj : .AUTODEPEND ..\..\lua\src\lparser.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lstate.obj : .AUTODEPEND ..\..\lua\src\lstate.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lstring.obj : .AUTODEPEND ..\..\lua\src\lstring.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ltable.obj : .AUTODEPEND ..\..\lua\src\ltable.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ltests.obj : .AUTODEPEND ..\..\lua\src\ltests.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ltm.obj : .AUTODEPEND ..\..\lua\src\ltm.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lundump.obj : .AUTODEPEND ..\..\lua\src\lundump.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lvm.obj : .AUTODEPEND ..\..\lua\src\lvm.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lzio.obj : .AUTODEPEND ..\..\lua\src\lzio.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj : .AUTODEPEND ..\..\lua\src\lib\lauxlib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj : .AUTODEPEND ..\..\lua\src\lib\lbaselib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ldblib.obj : .AUTODEPEND ..\..\lua\src\lib\ldblib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_liolib.obj : .AUTODEPEND ..\..\lua\src\lib\liolib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj : .AUTODEPEND ..\..\lua\src\lib\lmathlib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_loadlib.obj : .AUTODEPEND ..\..\lua\src\lib\loadlib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj : .AUTODEPEND ..\..\lua\src\lib\lstrlib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< ! watcom$(WXLIBPOSTFIX)\lua_lib_ltablib.obj : .AUTODEPEND ..\..\lua\src\lib\ltablib.c ! $(CC) -zq -fo=$^@ $(LUA_LIB_CFLAGS) $< watcom$(WXLIBPOSTFIX)\lua_lua.obj : .AUTODEPEND ..\..\lua\src\lua\lua.c Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.gcc 12 Jun 2005 22:09:13 -0000 1.3 --- makefile.gcc 14 Jun 2005 21:44:41 -0000 1.4 *************** *** 41,44 **** --- 41,47 ---- WX_DEBUG = 1 + # Version of the wx library to build against. + WX_VERSION = 26 + *************** *** 51,54 **** --- 54,78 ---- LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\lua_lib_lapi.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lcode.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ldebug.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ldllmain.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ldo.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ldump.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lfunc.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lgc.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_llex.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lmem.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lobject.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lopcodes.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lparser.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lstate.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lstring.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ltable.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ltests.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_ltm.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lundump.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lvm.o \ + mingw$(WXLIBPOSTFIX)\lua_lib_lzio.o \ mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o \ mingw$(WXLIBPOSTFIX)\lua_lib_lbaselib.o \ *************** *** 61,132 **** LUA_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ - mingw$(WXLIBPOSTFIX)\lua_lapi.o \ - mingw$(WXLIBPOSTFIX)\lua_lcode.o \ - mingw$(WXLIBPOSTFIX)\lua_ldebug.o \ - mingw$(WXLIBPOSTFIX)\lua_ldllmain.o \ - mingw$(WXLIBPOSTFIX)\lua_ldo.o \ - mingw$(WXLIBPOSTFIX)\lua_ldump.o \ - mingw$(WXLIBPOSTFIX)\lua_lfunc.o \ - mingw$(WXLIBPOSTFIX)\lua_lgc.o \ - mingw$(WXLIBPOSTFIX)\lua_llex.o \ - mingw$(WXLIBPOSTFIX)\lua_lmem.o \ - mingw$(WXLIBPOSTFIX)\lua_lobject.o \ - mingw$(WXLIBPOSTFIX)\lua_lopcodes.o \ - mingw$(WXLIBPOSTFIX)\lua_lparser.o \ - mingw$(WXLIBPOSTFIX)\lua_lstate.o \ - mingw$(WXLIBPOSTFIX)\lua_lstring.o \ - mingw$(WXLIBPOSTFIX)\lua_ltable.o \ - mingw$(WXLIBPOSTFIX)\lua_ltests.o \ - mingw$(WXLIBPOSTFIX)\lua_ltm.o \ - mingw$(WXLIBPOSTFIX)\lua_lundump.o \ - mingw$(WXLIBPOSTFIX)\lua_lvm.o \ - mingw$(WXLIBPOSTFIX)\lua_lzio.o \ mingw$(WXLIBPOSTFIX)\lua_lua.o ! WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) \ ! $(__DEBUGINFO_2) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxlua_internal.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_interp.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_library.o ### Conditionally set variables: ### ! ifeq ($(WX_SHARED),0) ! __wxlua___depname = ..\..\..\lib\gcc_lib\libwxlua.a endif ! ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(WX_SHARED),0) ! __WXLIBPATH_FILENAMES = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) ! __WXLIBPATH_FILENAMES = \lib\gcc_dll endif ! ifeq ($(WX_DEBUG),0) ! __WARNINGS_0 = endif ! ifeq ($(WX_DEBUG),1) ! __WARNINGS_0 = -W -Wall endif ! ifeq ($(WX_DEBUG),0) ! __OPTIMIZEFLAG_1 = -O2 endif ! ifeq ($(WX_DEBUG),1) ! __OPTIMIZEFLAG_1 = -O0 endif ! ifeq ($(WX_DEBUG),0) ! __DEBUGINFO_2 = endif ifeq ($(WX_DEBUG),1) ! __DEBUGINFO_2 = -g ! endif ! ifeq ($(WX_SHARED),1) ! __WX_SHAREDDEFINE_p = -DWXUSINGDLL endif ifeq ($(WX_DEBUG),0) --- 85,183 ---- LUA_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\lua_lua.o ! WXLUA_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_interp.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_library.o ! WXLUA_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) -DA2DWXLUAMAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_DLL_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_interp.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_library.o ! WXLUADEBUG_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) -DA2DWXLUADEBUGMAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_DLL_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_debug.o \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUASOCKET_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_debugio.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dserver.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dtarget.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_socket.o ! WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS) $(__OPTIMIZEFLAG) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) -DA2DWXLUASOCKETMAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) ! WXLUASOCKET_DLL_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_debugio.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dserver.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dtarget.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_socket.o ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ! WX3RDPARTLIBPOSTFIX = d endif ! ifeq ($(WX_SHARED),0) ! __wxlua_lib___depname = ..\..\..\lib\gcc_lib\libwxlua.a endif ! ifeq ($(WX_SHARED),1) ! __wxlua_dll___depname = ..\..\..\lib\gcc_dll\wxlua_dll.dll endif ifeq ($(WX_SHARED),0) ! __wxluadebug_lib___depname = ..\..\..\lib\gcc_lib\libwxluadebug.a endif ifeq ($(WX_SHARED),1) ! __wxluadebug_dll___depname = ..\..\..\lib\gcc_dll\wxluadebug_dll.dll endif ! ifeq ($(WX_SHARED),0) ! __wxluasocket_lib___depname = ..\..\..\lib\gcc_lib\libwxluasocket.a endif ! ifeq ($(WX_SHARED),1) ! __wxluasocket_dll___depname = ..\..\..\lib\gcc_dll\wxluasocket_dll.dll endif ! ifeq ($(WX_SHARED),0) ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib endif ! ifeq ($(WX_SHARED),1) ! __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(WX_DEBUG),0) *************** *** 145,148 **** --- 196,226 ---- endif endif + ifeq ($(WX_DEBUG),0) + __WARNINGS = + endif + ifeq ($(WX_DEBUG),1) + __WARNINGS = -W -Wall + endif + ifeq ($(WX_DEBUG),0) + __OPTIMIZEFLAG = -O2 + endif + ifeq ($(WX_DEBUG),1) + __OPTIMIZEFLAG = -O0 + endif + ifeq ($(WX_SHARED),1) + __WX_SHAREDDEFINE_p = -DWXUSINGDLL + endif + ifeq ($(WX_SHARED),0) + __WXLIBPATH_FILENAMES = \lib\gcc_lib + endif + ifeq ($(WX_SHARED),1) + __WXLIBPATH_FILENAMES = \lib\gcc_dll + endif + ifeq ($(WX_DEBUG),0) + __DEBUGINFO = + endif + ifeq ($(WX_DEBUG),1) + __DEBUGINFO = -g + endif *************** *** 153,157 **** ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua___depname) clean: --- 231,235 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib ..\..\..\lib\gcc_dll ..\..\..\lib\gcc_lib\liblua.a ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 160,163 **** --- 238,249 ---- -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\lib\gcc_lib\libwxlua.a del ..\..\..\lib\gcc_lib\libwxlua.a + -if exist ..\..\..\lib\gcc_dll\wxlua_dll.dll del ..\..\..\lib\gcc_dll\wxlua_dll.dll + -if exist ..\..\..\lib\gcc_dll\libwxlua.a del ..\..\..\lib\gcc_dll\libwxlua.a + -if exist ..\..\..\lib\gcc_lib\libwxluadebug.a del ..\..\..\lib\gcc_lib\libwxluadebug.a + -if exist ..\..\..\lib\gcc_dll\wxluadebug_dll.dll del ..\..\..\lib\gcc_dll\wxluadebug_dll.dll + -if exist ..\..\..\lib\gcc_dll\libwxluadebug.a del ..\..\..\lib\gcc_dll\libwxluadebug.a + -if exist ..\..\..\lib\gcc_lib\libwxluasocket.a del ..\..\..\lib\gcc_lib\libwxluasocket.a + -if exist ..\..\..\lib\gcc_dll\wxluasocket_dll.dll del ..\..\..\lib\gcc_dll\wxluasocket_dll.dll + -if exist ..\..\..\lib\gcc_dll\libwxluasocket.a del ..\..\..\lib\gcc_dll\libwxluasocket.a ..\..\..\lib\gcc_lib: *************** *** 176,185 **** ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxlua.a: $(WXLUA_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(WXLUA_OBJECTS) ranlib $@ endif mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< --- 262,363 ---- ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxlua.a: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(WXLUA_LIB_OBJECTS) ! ranlib $@ ! endif ! ! ifeq ($(WX_SHARED),1) ! ..\..\..\lib\gcc_dll\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! endif ! ! ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxluadebug.a: $(WXLUADEBUG_LIB_OBJECTS) ! if exist $@ del $@ ! ar rcu $@ $(WXLUADEBUG_LIB_OBJECTS) ! ranlib $@ ! endif ! ! ifeq ($(WX_SHARED),1) ! ..\..\..\lib\gcc_dll\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluadebug.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! endif ! ! ifeq ($(WX_SHARED),0) ! ..\..\..\lib\gcc_lib\libwxluasocket.a: $(WXLUASOCKET_LIB_OBJECTS) ! if exist $@ del $@ ! ar rcu $@ $(WXLUASOCKET_LIB_OBJECTS) ranlib $@ endif + ifeq ($(WX_SHARED),1) + ..\..\..\lib\gcc_dll\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) + $(CXX) -shared -fPIC -o $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxluasocket.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + endif + + mingw$(WXLIBPOSTFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lcode.o: ../../lua/src/lcode.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ldebug.o: ../../lua/src/ldebug.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ldllmain.o: ../../lua/src/ldllmain.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ldo.o: ../../lua/src/ldo.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ldump.o: ../../lua/src/ldump.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lfunc.o: ../../lua/src/lfunc.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lgc.o: ../../lua/src/lgc.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_llex.o: ../../lua/src/llex.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lmem.o: ../../lua/src/lmem.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lobject.o: ../../lua/src/lobject.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lopcodes.o: ../../lua/src/lopcodes.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lparser.o: ../../lua/src/lparser.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lstate.o: ../../lua/src/lstate.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lstring.o: ../../lua/src/lstring.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ltable.o: ../../lua/src/ltable.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ltests.o: ../../lua/src/ltests.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_ltm.o: ../../lua/src/ltm.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lundump.o: ../../lua/src/lundump.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lvm.o: ../../lua/src/lvm.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + + mingw$(WXLIBPOSTFIX)\lua_lib_lzio.o: ../../lua/src/lzio.c + $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< + mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< *************** *** 206,283 **** $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lapi.o: ../../lua/src/lapi.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! ! mingw$(WXLIBPOSTFIX)\lua_lcode.o: ../../lua/src/lcode.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! ! mingw$(WXLIBPOSTFIX)\lua_ldebug.o: ../../lua/src/ldebug.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! ! mingw$(WXLIBPOSTFIX)\lua_ldllmain.o: ../../lua/src/ldllmain.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! ! mingw$(WXLIBPOSTFIX)\lua_ldo.o: ../../lua/src/ldo.c $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_ldump.o: ../../lua/src/ldump.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lfunc.o: ../../lua/src/lfunc.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lgc.o: ../../lua/src/lgc.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_llex.o: ../../lua/src/llex.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lmem.o: ../../lua/src/lmem.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lobject.o: ../../lua/src/lobject.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lopcodes.o: ../../lua/src/lopcodes.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lparser.o: ../../lua/src/lparser.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lstate.o: ../../lua/src/lstate.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lstring.o: ../../lua/src/lstring.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_ltable.o: ../../lua/src/ltable.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_ltests.o: ../../lua/src/ltests.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_ltm.o: ../../lua/src/ltm.c ! $(CC) -c -o $@ $(LUA_CFLAGS) ... [truncated message content] |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/modules Modified Files: Makefile.in Log Message: Fixed modules compilation Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 14 Jun 2005 20:22:49 -0000 1.1 --- Makefile.in 14 Jun 2005 21:44:41 -0000 1.2 *************** *** 11,19 **** --- 11,26 ---- exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ + SHARED_LD_CXX = @SHARED_LD_CXX@ LIBEXT = @LIBEXT@ LIBPREFIX = @LIBPREFIX@ + SO_SUFFIX = @SO_SUFFIX@ + DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ EXEEXT = @EXEEXT@ + LN_S = @LN_S@ SETFILE = @SETFILE@ + PIC_FLAG = @PIC_FLAG@ + SONAME_FLAG = @SONAME_FLAG@ top_builddir = @top_builddir@ + DLLPREFIX = @DLLPREFIX@ AR = @AR@ RANLIB = @RANLIB@ *************** *** 25,28 **** --- 32,36 ---- LDFLAGS = @LDFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ + WX_LIBS = @WX_LIBS@ ### Variables: ### *************** *** 31,34 **** --- 39,63 ---- LUA_LIB_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ + lua_lib_lapi.o \ + lua_lib_lcode.o \ + lua_lib_ldebug.o \ + lua_lib_ldllmain.o \ + lua_lib_ldo.o \ + lua_lib_ldump.o \ + lua_lib_lfunc.o \ + lua_lib_lgc.o \ + lua_lib_llex.o \ + lua_lib_lmem.o \ + lua_lib_lobject.o \ + lua_lib_lopcodes.o \ + lua_lib_lparser.o \ + lua_lib_lstate.o \ + lua_lib_lstring.o \ + lua_lib_ltable.o \ + lua_lib_ltests.o \ + lua_lib_ltm.o \ + lua_lib_lundump.o \ + lua_lib_lvm.o \ + lua_lib_lzio.o \ lua_lib_lauxlib.o \ lua_lib_lbaselib.o \ *************** *** 41,71 **** LUA_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ - lua_lapi.o \ - lua_lcode.o \ - lua_ldebug.o \ - lua_ldllmain.o \ - lua_ldo.o \ - lua_ldump.o \ - lua_lfunc.o \ - lua_lgc.o \ - lua_llex.o \ - lua_lmem.o \ - lua_lobject.o \ - lua_lopcodes.o \ - lua_lparser.o \ - lua_lstate.o \ - lua_lstring.o \ - lua_ltable.o \ - lua_ltests.o \ - lua_ltm.o \ - lua_lundump.o \ - lua_lvm.o \ - lua_lzio.o \ lua_lua.o ! WXLUA_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! wxlua_internal.o \ ! wxlua_interp.o \ ! wxlua_library.o ### Conditionally set variables: ### --- 70,110 ---- LUA_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_LIB_OBJECTS = \ ! wxlua_lib_internal.o \ ! wxlua_lib_interp.o \ ! wxlua_lib_library.o ! WXLUA_DLL_CXXFLAGS = -I./../modules -DA2DWXLUAMAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_DLL_OBJECTS = \ ! wxlua_dll_internal.o \ ! wxlua_dll_interp.o \ ! wxlua_dll_library.o ! WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_LIB_OBJECTS = \ ! wxluadebug_lib_debug.o \ ! wxluadebug_lib_splttree.o \ ! wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -I./../modules -DA2DWXLUADEBUGMAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUADEBUG_DLL_OBJECTS = \ ! wxluadebug_dll_debug.o \ ! wxluadebug_dll_splttree.o \ ! wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) ! WXLUASOCKET_LIB_OBJECTS = \ ! wxluasocket_lib_debugio.o \ ! wxluasocket_lib_dserver.o \ ! wxluasocket_lib_dtarget.o \ ! wxluasocket_lib_socket.o ! WXLUASOCKET_DLL_CXXFLAGS = -I./../modules -DA2DWXLUASOCKETMAKINGDLL \ ! $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUASOCKET_DLL_OBJECTS = \ ! wxluasocket_dll_debugio.o \ ! wxluasocket_dll_dserver.o \ ! wxluasocket_dll_dtarget.o \ ! wxluasocket_dll_socket.o ### Conditionally set variables: ### *************** *** 77,85 **** @COND_PLATFORM_MAC_1@__lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) ! @COND_WX_SHARED_0@__wxlua___depname = ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) ### Targets: ### ! all: ./../lib/$(LIBPREFIX)lua$(LIBEXT) ./../bin/lua$(EXEEXT) $(__wxlua___depname) install: all --- 116,198 ---- @COND_PLATFORM_MAC_1@__lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) ! @COND_WX_SHARED_0@__wxlua_lib___depname = \ ! @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) ! @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2) ! @COND_USE_SOVERLINUX_1@__wxlua_dll___soname_flags = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wxlua) ! @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wxlua_2) ! COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxlua_dll$(__wxlua); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wxlua_2) $(DLLPREFIX)wxlua_dll$(__wxlua); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wxlua) \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX)) ! @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd) ! @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ ! @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxlua_dll___importlib = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ ! @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) ! @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) ! @COND_USE_SOVERLINUX_1@__wxluadebug_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wxlua) ! @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) ! COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd ./../lib/; rm -f \ ! $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua_2) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wxlua) \ ! $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX)) ! @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd) ! @COND_PLATFORM_OS2_1@__wxluadebug_dll___importlib = \ ! @COND_PLATFORM_OS2_1@ -import \ ! @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxluadebug_dll___importlib \ ! @COND_PLATFORM_WIN32_1@ = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_0@__wxluasocket_lib___depname = \ ! @COND_WX_SHARED_0@ ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) ! @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) ! @COND_USE_SOVERLINUX_1@__wxluasocket_dll___soname_flags \ ! @COND_USE_SOVERLINUX_1@ = \ ! @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wxlua) ! @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) ! COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd ./../lib/; rm \ ! -f $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua_2) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wxlua) \ ! $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX)) ! @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd) ! @COND_PLATFORM_OS2_1@__wxluasocket_dll___importlib = \ ! @COND_PLATFORM_OS2_1@ -import \ ! @COND_PLATFORM_OS2_1@ ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_WIN32_1@__wxluasocket_dll___importlib \ ! @COND_PLATFORM_WIN32_1@ = \ ! @COND_PLATFORM_WIN32_1@ -Wl,--out-implib,./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wxlua = .$(SO_SUFFIX).0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wxlua = .0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wxlua = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__wxlua_2 = .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wxlua_2 = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wxlua_2 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wxlua_3 = \ ! @COND_PLATFORM_MACOSX_1@ -compatibility_version 0 -current_version 0 ### Targets: ### ! all: ./../lib/$(LIBPREFIX)lua$(LIBEXT) ./../bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) install: all *************** *** 95,98 **** --- 208,222 ---- rm -f ./../bin/lua$(EXEEXT) rm -f ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) + rm -f ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2) + rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) + rm -f ./../lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua) + rm -f ./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT) + rm -f ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2) + rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) + rm -f ./../lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua) + rm -f ./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT) + rm -f ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2) + rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) + rm -f ./../lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua) distclean: clean *************** *** 109,117 **** $(__lua___mac_setfilecmd) ! @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ ! @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUA_OBJECTS) @COND_WX_SHARED_0@ $(RANLIB) $@ lua_lib_lauxlib.o: ./lua/src/lib/lauxlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lauxlib.c --- 233,329 ---- $(__lua___mac_setfilecmd) ! @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ ! @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUA_LIB_OBJECTS) @COND_WX_SHARED_0@ $(RANLIB) $@ + @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxlua_dll$(__wxlua_2): $(WXLUA_DLL_OBJECTS) + @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxlua_dll___importlib) $(WX_LIBS) + @COND_WX_SHARED_1@ + @COND_WX_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) + + @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxluadebug$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) + @COND_WX_SHARED_0@ rm -f $@ + @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUADEBUG_LIB_OBJECTS) + @COND_WX_SHARED_0@ $(RANLIB) $@ + + @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluadebug_dll$(__wxlua_2): $(WXLUADEBUG_DLL_OBJECTS) + @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxluadebug_dll___importlib) $(WX_LIBS) + @COND_WX_SHARED_1@ + @COND_WX_SHARED_1@ $(__wxluadebug_dll___so_symlinks_cmd) + + @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxluasocket$(LIBEXT): $(WXLUASOCKET_LIB_OBJECTS) + @COND_WX_SHARED_0@ rm -f $@ + @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUASOCKET_LIB_OBJECTS) + @COND_WX_SHARED_0@ $(RANLIB) $@ + + @COND_WX_SHARED_1@./../lib/$(DLLPREFIX)wxluasocket_dll$(__wxlua_2): $(WXLUASOCKET_DLL_OBJECTS) + @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___soname_flags) $(__wxlua_3) -L./../lib $(__wxluasocket_dll___importlib) $(WX_LIBS) + @COND_WX_SHARED_1@ + @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) + + lua_lib_lapi.o: ./lua/src/lapi.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lapi.c + + lua_lib_lcode.o: ./lua/src/lcode.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lcode.c + + lua_lib_ldebug.o: ./lua/src/ldebug.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldebug.c + + lua_lib_ldllmain.o: ./lua/src/ldllmain.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldllmain.c + + lua_lib_ldo.o: ./lua/src/ldo.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldo.c + + lua_lib_ldump.o: ./lua/src/ldump.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldump.c + + lua_lib_lfunc.o: ./lua/src/lfunc.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lfunc.c + + lua_lib_lgc.o: ./lua/src/lgc.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lgc.c + + lua_lib_llex.o: ./lua/src/llex.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/llex.c + + lua_lib_lmem.o: ./lua/src/lmem.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lmem.c + + lua_lib_lobject.o: ./lua/src/lobject.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lobject.c + + lua_lib_lopcodes.o: ./lua/src/lopcodes.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lopcodes.c + + lua_lib_lparser.o: ./lua/src/lparser.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lparser.c + + lua_lib_lstate.o: ./lua/src/lstate.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lstate.c + + lua_lib_lstring.o: ./lua/src/lstring.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lstring.c + + lua_lib_ltable.o: ./lua/src/ltable.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltable.c + + lua_lib_ltests.o: ./lua/src/ltests.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltests.c + + lua_lib_ltm.o: ./lua/src/ltm.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltm.c + + lua_lib_lundump.o: ./lua/src/lundump.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lundump.c + + lua_lib_lvm.o: ./lua/src/lvm.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lvm.c + + lua_lib_lzio.o: ./lua/src/lzio.c + $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lzio.c + lua_lib_lauxlib.o: ./lua/src/lib/lauxlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lauxlib.c *************** *** 138,215 **** $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ltablib.c ! lua_lapi.o: ./lua/src/lapi.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lapi.c ! ! lua_lcode.o: ./lua/src/lcode.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lcode.c ! ! lua_ldebug.o: ./lua/src/ldebug.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldebug.c ! ! lua_ldllmain.o: ./lua/src/ldllmain.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldllmain.c ! ! lua_ldo.o: ./lua/src/ldo.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldo.c ! lua_ldump.o: ./lua/src/ldump.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldump.c ! lua_lfunc.o: ./lua/src/lfunc.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lfunc.c ! lua_lgc.o: ./lua/src/lgc.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lgc.c ! lua_llex.o: ./lua/src/llex.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/llex.c ! lua_lmem.o: ./lua/src/lmem.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lmem.c ! lua_lobject.o: ./lua/src/lobject.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lobject.c ! lua_lopcodes.o: ./lua/src/lopcodes.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lopcodes.c ! lua_lparser.o: ./lua/src/lparser.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lparser.c ! lua_lstate.o: ./lua/src/lstate.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lstate.c ! lua_lstring.o: ./lua/src/lstring.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lstring.c ! lua_ltable.o: ./lua/src/ltable.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltable.c ! lua_ltests.o: ./lua/src/ltests.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltests.c ! lua_ltm.o: ./lua/src/ltm.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltm.c ! lua_lundump.o: ./lua/src/lundump.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lundump.c ! lua_lvm.o: ./lua/src/lvm.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lvm.c ! lua_lzio.o: ./lua/src/lzio.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lzio.c ! lua_lua.o: ./lua/src/lua/lua.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lua/lua.c ! wxlua_internal.o: ./wxlua/src/internal.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/internal.cpp ! wxlua_interp.o: ./wxlua/src/interp.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/interp.cpp ! wxlua_library.o: ./wxlua/src/library.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/library.cpp --- 350,415 ---- $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ltablib.c ! lua_lua.o: ./lua/src/lua/lua.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lua/lua.c ! wxlua_lib_internal.o: ./wxlua/src/internal.cpp ! $(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/internal.cpp ! wxlua_lib_interp.o: ./wxlua/src/interp.cpp ! $(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/interp.cpp ! wxlua_lib_library.o: ./wxlua/src/library.cpp ! $(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) ./wxlua/src/library.cpp ! wxlua_dll_internal.o: ./wxlua/src/internal.cpp ! $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/internal.cpp ! wxlua_dll_interp.o: ./wxlua/src/interp.cpp ! $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/interp.cpp ! wxlua_dll_library.o: ./wxlua/src/library.cpp ! $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) ./wxlua/src/library.cpp ! wxluadebug_lib_debug.o: ./wxluadebug/src/debug.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/debug.cpp ! wxluadebug_lib_splttree.o: ./wxluadebug/src/splttree.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/splttree.cpp ! wxluadebug_lib_staktree.o: ./wxluadebug/src/staktree.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/staktree.cpp ! wxluadebug_dll_debug.o: ./wxluadebug/src/debug.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) ./wxluadebug/src/debug.cpp ! wxluadebug_dll_splttree.o: ./wxluadebug/src/splttree.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) ./wxluadebug/src/splttree.cpp ! wxluadebug_dll_staktree.o: ./wxluadebug/src/staktree.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) ./wxluadebug/src/staktree.cpp ! wxluasocket_lib_debugio.o: ./wxluasocket/src/debugio.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/debugio.cpp ! wxluasocket_lib_dserver.o: ./wxluasocket/src/dserver.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/dserver.cpp ! wxluasocket_lib_dtarget.o: ./wxluasocket/src/dtarget.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/dtarget.cpp ! wxluasocket_lib_socket.o: ./wxluasocket/src/socket.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/socket.cpp ! wxluasocket_dll_debugio.o: ./wxluasocket/src/debugio.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/debugio.cpp ! wxluasocket_dll_dserver.o: ./wxluasocket/src/dserver.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/dserver.cpp ! wxluasocket_dll_dtarget.o: ./wxluasocket/src/dtarget.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/dtarget.cpp ! wxluasocket_dll_socket.o: ./wxluasocket/src/socket.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/socket.cpp |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/util/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixed modules compilation Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.vc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.vc 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 32,37 **** WX_DEBUG = 1 ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! USE_UTIL = 1 --- 32,37 ---- WX_DEBUG = 1 ! # Does the wxLua utilities should be compiled ? [0,1] ! USE_BIN2C = 1 *************** *** 49,53 **** ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" __bin2c___depname = ..\..\..\bin\bin2c.exe !endif --- 49,53 ---- ### Conditionally set variables: ### ! !if "$(USE_BIN2C)" == "1" __bin2c___depname = ..\..\..\bin\bin2c.exe !endif *************** *** 66,70 **** -if exist ..\..\..\bin\bin2c.pdb del ..\..\..\bin\bin2c.pdb ! !if "$(USE_UTIL)" == "1" ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) @<< --- 66,70 ---- -if exist ..\..\..\bin\bin2c.pdb del ..\..\..\bin\bin2c.pdb ! !if "$(USE_BIN2C)" == "1" ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) @<< Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.bcc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.bcc 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 55,61 **** !endif ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! !ifndef USE_UTIL ! USE_UTIL = 1 !endif --- 55,61 ---- !endif ! # Does the wxLua utilities should be compiled ? [0,1] ! !ifndef USE_BIN2C ! USE_BIN2C = 1 !endif *************** *** 74,78 **** ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" __bin2c___depname = ..\..\..\bin\bin2c.exe !endif --- 74,78 ---- ### Conditionally set variables: ### ! !if "$(USE_BIN2C)" == "1" __bin2c___depname = ..\..\..\bin\bin2c.exe !endif *************** *** 94,98 **** -if exist ..\..\..\bin\bin2c.ils del ..\..\..\bin\bin2c.ils ! !if "$(USE_UTIL)" == "1" ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| --- 94,98 ---- -if exist ..\..\..\bin\bin2c.ils del ..\..\..\bin\bin2c.ils ! !if "$(USE_BIN2C)" == "1" ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.wat 12 Jun 2005 21:21:12 -0000 1.1 --- makefile.wat 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 32,37 **** WX_DEBUG = 1 ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! USE_UTIL = 1 --- 32,37 ---- WX_DEBUG = 1 ! # Does the wxLua utilities should be compiled ? [0,1] ! USE_BIN2C = 1 *************** *** 59,63 **** __bin2c___depname = ! !ifeq USE_UTIL 1 __bin2c___depname = ..\..\..\bin\bin2c.exe !endif --- 59,63 ---- __bin2c___depname = ! !ifeq USE_BIN2C 1 __bin2c___depname = ..\..\..\bin\bin2c.exe !endif *************** *** 82,86 **** -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ! !ifeq USE_UTIL 1 ..\..\..\bin\bin2c.exe : $(BIN2C_OBJECTS) @%create bin2c.lbc --- 82,86 ---- -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ! !ifeq USE_BIN2C 1 ..\..\..\bin\bin2c.exe : $(BIN2C_OBJECTS) @%create bin2c.lbc Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.gcc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.gcc 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 32,37 **** WX_DEBUG = 1 ! # Does the wxLua utilities shoulb be compiled ? [0,1] ! USE_UTIL = 1 --- 32,37 ---- WX_DEBUG = 1 ! # Does the wxLua utilities should be compiled ? [0,1] ! USE_BIN2C = 1 *************** *** 49,53 **** ### Conditionally set variables: ### ! ifeq ($(USE_UTIL),1) __bin2c___depname = ..\..\..\bin\bin2c.exe endif --- 49,53 ---- ### Conditionally set variables: ### ! ifeq ($(USE_BIN2C),1) __bin2c___depname = ..\..\..\bin\bin2c.exe endif *************** *** 62,66 **** -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ! ifeq ($(USE_UTIL),1) ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) --- 62,66 ---- -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ! ifeq ($(USE_BIN2C),1) ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/modules/build/bakefiles Modified Files: modules.bkl Log Message: Fixed modules compilation Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules.bkl 12 Jun 2005 22:09:12 -0000 1.3 --- modules.bkl 14 Jun 2005 21:44:41 -0000 1.4 *************** *** 176,181 **** the same conventions followed by other modules... --> <lib id="lua_lib"> ! <sources>$(lualib_src)</sources> ! <headers>$(lualib_hdr)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> --- 176,181 ---- the same conventions followed by other modules... --> <lib id="lua_lib"> ! <sources>$(lua_src) $(lualib_src)</sources> ! <headers>(lua_hdr) $(lualib_hdr)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> *************** *** 187,192 **** <exe id="lua"> <library>lua_lib</library> ! <sources>$(lua_src) lua/src/lua/lua.c</sources> ! <headers>$(lua_hdr)</headers> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> --- 187,191 ---- <exe id="lua"> <library>lua_lib</library> ! <sources>lua/src/lua/lua.c</sources> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:52
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/build/bakefiles Modified Files: globalregen.bat wxlua.bkl wxluabase.bkl Log Message: Fixed modules compilation Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluabase.bkl 12 Jun 2005 22:09:12 -0000 1.2 --- wxluabase.bkl 14 Jun 2005 21:44:40 -0000 1.3 *************** *** 206,210 **** </template> ! <!-- a template for wxlua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> <!-- we don't need to add anything else to wxlua-base template --> --- 206,210 ---- </template> ! <!-- a template for wxLua-based libraries --> <template id="wxlua-lib" template="wx-lib,wxlua-base"> <!-- we don't need to add anything else to wxlua-base template --> Index: globalregen.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/globalregen.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** globalregen.bat 12 Jun 2005 18:29:20 -0000 1.1 --- globalregen.bat 14 Jun 2005 21:44:40 -0000 1.2 *************** *** 14,18 **** ( cd ..\..\apps\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ( cd ..\..\modules\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ! ( cd ..\..\utils\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) echo. echo Regeneration completed. --- 14,18 ---- ( cd ..\..\apps\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ( cd ..\..\modules\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) ! ( cd ..\..\util\build\bakefiles && bakefile_gen && cd ..\..\..\build\bakefiles ) echo. echo Regeneration completed. Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxlua.bkl 12 Jun 2005 21:31:38 -0000 1.3 --- wxlua.bkl 14 Jun 2005 21:44:40 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- <makefile> + <!-- This is required because it contains the definitions of a lot of utils --> <include file="wxluabase.bkl"/> *************** *** 23,26 **** --- 24,84 ---- + <!-- some dummy vars so that unused vars are not removed from the output: + in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this + bakefile and so Bakefile would remove them from the final + makefiles but this must be avoid ! + In fact, the generated makefile would then contain something like: + + MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ + WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ + WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ + USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" + + where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are + undeclared variables from MAKE's point of view... + + --> + + <set var="USE_UTIL_DEFAULT">1</set> + <set var="USE_APPS_DEFAULT">1</set> + + <!-- options not tied to a specific module --> + <if cond="TARGETING_IDE=='0'"> + + <option name="USE_UTIL"> + <values>0,1</values> + <default-value>$(USE_UTIL_DEFAULT)</default-value> + <description>Does the wxLua utilities should be compiled ?</description> + </option> + <option name="USE_APPS"> + <values>0,1</values> + <default-value>$(USE_APPS_DEFAULT)</default-value> + <description>Does the wxLua applications should be compiled ?</description> + </option> + + </if> + + <if cond="TARGETING_IDE=='1'"> + + <!-- IDEs are less flexible; we have to set these as variables with the default + values --> + <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set> + <set var="USE_APPS">$(USE_APPS_DEFAULT)</set> + </if> + + + + + <if cond="TARGETING_WIN32=='1'"> + <set var="dummy1"><if cond="WX_DIR=='dummy'">AAA</if></set> + <set var="dummy2"><if cond="WX_VERSION=='dummy'">AAA</if></set> + <set var="dummy3"><if cond="WX_SHARED=='dummy'">AAA</if></set> + <set var="dummy4"><if cond="USE_WXLUASOCKET=='dummy'">AAA</if></set> + <set var="dummy5"><if cond="USE_WXLUADEBUG=='dummy'">AAA</if></set> + <set var="dummy6"><if cond="USE_BIN2C=='dummy'">AAA</if></set> + </if> + + <!-- --> *************** *** 28,32 **** <!-- --> ! <subproject id="utils"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> --- 86,90 ---- <!-- --> ! <subproject id="utils" cond="USE_UTIL=='1'"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> *************** *** 54,58 **** <!-- --> ! <subproject id="apps"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> --- 112,116 ---- <!-- --> ! <subproject id="apps" cond="USE_APPS=='1'"> <dependency-of>all</dependency-of> <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> |
|
From: Francesco <fr...@us...> - 2005-06-14 21:44:51
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3140/util/build/bakefiles Modified Files: options.bkl util.bkl Log Message: Fixed modules compilation Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/options.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** options.bkl 12 Jun 2005 21:21:11 -0000 1.1 --- options.bkl 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 14,18 **** <!-- --> ! <set var="USE_UTIL_DEFAULT">1</set> --- 14,18 ---- <!-- --> ! <set var="USE_BIN2C_DEFAULT">1</set> *************** *** 25,32 **** <if cond="TARGETING_IDE=='0'"> ! <option name="USE_UTIL"> <values>0,1</values> ! <default-value>$(USE_UTIL_DEFAULT)</default-value> ! <description>Does the wxLua utilities shoulb be compiled ?</description> </option> --- 25,32 ---- <if cond="TARGETING_IDE=='0'"> ! <option name="USE_BIN2C"> <values>0,1</values> ! <default-value>$(USE_BIN2C_DEFAULT)</default-value> ! <description>Does the wxLua utilities should be compiled ?</description> </option> *************** *** 37,41 **** <!-- IDEs are less flexible; we have to set these as variables with the default values --> ! <set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set> </if> --- 37,41 ---- <!-- IDEs are less flexible; we have to set these as variables with the default values --> ! <set var="USE_BIN2C">$(USE_BIN2C_DEFAULT)</set> </if> Index: util.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** util.bkl 12 Jun 2005 21:21:11 -0000 1.1 --- util.bkl 14 Jun 2005 21:44:42 -0000 1.2 *************** *** 33,37 **** <!-- our utilities --> ! <exe id="bin2c" cond="USE_UTIL=='1'"> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> --- 33,37 ---- <!-- our utilities --> ! <exe id="bin2c" cond="USE_BIN2C=='1'"> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> |
|
From: Francesco <fr...@us...> - 2005-06-14 20:23:25
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22666/apps/build/bakefiles Modified Files: Bakefiles.bkgen Log Message: Fixing makefiles Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Bakefiles.bkgen 12 Jun 2005 21:21:10 -0000 1.1 --- Bakefiles.bkgen 14 Jun 2005 20:22:47 -0000 1.2 *************** *** 14,18 **** <add-formats> <!-- autoconf,borland,dmars,mingw,,watcom,cbuilderx,cbx_unix,gnu --> ! msvc,watcom,borland,mingw </add-formats> --- 14,18 ---- <add-formats> <!-- autoconf,borland,dmars,mingw,,watcom,cbuilderx,cbx_unix,gnu --> ! msvc,watcom,borland,mingw,autoconf </add-formats> *************** *** 50,54 **** </add-flags> <add-flags formats="autoconf"> ! -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 </add-flags> --- 50,54 ---- </add-flags> <add-flags formats="autoconf"> ! -DAUTOCONF_MACROS_FILE=../../../autoconf_inc.m4 </add-flags> |
|
From: Francesco <fr...@us...> - 2005-06-14 20:23:05
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22666/apps Added Files: Makefile.in Log Message: Fixing makefiles --- NEW FILE: Makefile.in --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @MAKE_SET@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ SETFILE = @SETFILE@ top_builddir = @top_builddir@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ ### Variables: ### DESTDIR = WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ wxlua_wxlua.o \ wxlua_lconsole.o ### Conditionally set variables: ### @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_PLATFORM_MAC_1@__wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) ### Targets: ### all: ../bin/wxlua$(EXEEXT) install: all uninstall: install-strip: install clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f ../bin/wxlua$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) $(__wxlua___mac_setfilecmd) wxlua_wxlua.o: ../wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/wxlua.cpp wxlua_lconsole.o: ../wxlua/src/lconsole.cpp $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ../wxlua/src/lconsole.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d .PHONY: all install uninstall clean distclean |
|
From: Francesco <fr...@us...> - 2005-06-14 20:23:05
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22666/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Fixing makefiles Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.vc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.vc 14 Jun 2005 20:22:48 -0000 1.2 *************** *** 49,56 **** $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include /I..\..\..\include /I..\..\..\modules $(__WARNINGS_2) \ ! $(__OPTIMIZEFLAG_3) $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb \ ! $(____DEBUGRUNTIME_6_p) $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ --- 49,55 ---- $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include /I..\..\..\modules $(__WARNINGS_2) $(__OPTIMIZEFLAG_3) \ ! $(__DEBUGINFO_4) /Fd..\..\..\bin\wxlua.pdb $(____DEBUGRUNTIME_6_p) \ ! $(__WX_SHAREDDEFINE_p) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.bcc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.bcc 14 Jun 2005 20:22:47 -0000 1.2 *************** *** 76,82 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\include -I..\..\..\modules \ ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ --- 76,81 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ ! -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.wat 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.wat 14 Jun 2005 20:22:48 -0000 1.2 *************** *** 140,146 **** WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\include -i=..\..\..\modules & ! $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm & ! $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & --- 140,146 ---- WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & ! $(CXXFLAGS) WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.gcc 12 Jun 2005 21:21:11 -0000 1.1 --- makefile.gcc 14 Jun 2005 20:22:48 -0000 1.2 *************** *** 48,54 **** WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\include -I..\..\..\modules $(__WARNINGS_0) \ ! $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ --- 48,53 ---- WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ -D__WXMSW__ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) \ ! $(__DEBUGINFO) -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ |
|
From: Francesco <fr...@us...> - 2005-06-14 20:23:02
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22666/modules Added Files: Makefile.in Log Message: Fixing makefiles --- NEW FILE: Makefile.in --- # ========================================================================= # This makefile was generated by # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @MAKE_SET@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ LIBEXT = @LIBEXT@ LIBPREFIX = @LIBPREFIX@ EXEEXT = @EXEEXT@ SETFILE = @SETFILE@ top_builddir = @top_builddir@ AR = @AR@ RANLIB = @RANLIB@ CC = @CC@ CXX = @CXX@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ ### Variables: ### DESTDIR = LUA_LIB_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ lua_lib_lauxlib.o \ lua_lib_lbaselib.o \ lua_lib_ldblib.o \ lua_lib_liolib.o \ lua_lib_lmathlib.o \ lua_lib_loadlib.o \ lua_lib_lstrlib.o \ lua_lib_ltablib.o LUA_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) LUA_OBJECTS = \ lua_lapi.o \ lua_lcode.o \ lua_ldebug.o \ lua_ldllmain.o \ lua_ldo.o \ lua_ldump.o \ lua_lfunc.o \ lua_lgc.o \ lua_llex.o \ lua_lmem.o \ lua_lobject.o \ lua_lopcodes.o \ lua_lparser.o \ lua_lstate.o \ lua_lstring.o \ lua_ltable.o \ lua_ltests.o \ lua_ltm.o \ lua_lundump.o \ lua_lvm.o \ lua_lzio.o \ lua_lua.o WXLUA_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_OBJECTS = \ wxlua_internal.o \ wxlua_interp.o \ wxlua_library.o ### Conditionally set variables: ### @COND_DEPS_TRACKING_0@CCC = $(CC) @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) @COND_WX_SHARED_0@__wxlua___depname = ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) ### Targets: ### all: ./../lib/$(LIBPREFIX)lua$(LIBEXT) ./../bin/lua$(EXEEXT) $(__wxlua___depname) install: all uninstall: install-strip: install clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f ./../lib/$(LIBPREFIX)lua$(LIBEXT) rm -f ./../bin/lua$(EXEEXT) rm -f ./../lib/$(LIBPREFIX)wxlua$(LIBEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ./../lib/$(LIBPREFIX)lua$(LIBEXT): $(LUA_LIB_OBJECTS) rm -f $@ $(AR) rcu $@ $(LUA_LIB_OBJECTS) $(RANLIB) $@ ./../bin/lua$(EXEEXT): $(LUA_OBJECTS) ./../lib/$(LIBPREFIX)lua$(LIBEXT) $(CC) -o $@ $(LUA_OBJECTS) -L./../lib $(LDFLAGS) -llua $(__lua___mac_setfilecmd) @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUA_OBJECTS) @COND_WX_SHARED_0@ $(RANLIB) $@ lua_lib_lauxlib.o: ./lua/src/lib/lauxlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lauxlib.c lua_lib_lbaselib.o: ./lua/src/lib/lbaselib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lbaselib.c lua_lib_ldblib.o: ./lua/src/lib/ldblib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ldblib.c lua_lib_liolib.o: ./lua/src/lib/liolib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/liolib.c lua_lib_lmathlib.o: ./lua/src/lib/lmathlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lmathlib.c lua_lib_loadlib.o: ./lua/src/lib/loadlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/loadlib.c lua_lib_lstrlib.o: ./lua/src/lib/lstrlib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lstrlib.c lua_lib_ltablib.o: ./lua/src/lib/ltablib.c $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ltablib.c lua_lapi.o: ./lua/src/lapi.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lapi.c lua_lcode.o: ./lua/src/lcode.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lcode.c lua_ldebug.o: ./lua/src/ldebug.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldebug.c lua_ldllmain.o: ./lua/src/ldllmain.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldllmain.c lua_ldo.o: ./lua/src/ldo.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldo.c lua_ldump.o: ./lua/src/ldump.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ldump.c lua_lfunc.o: ./lua/src/lfunc.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lfunc.c lua_lgc.o: ./lua/src/lgc.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lgc.c lua_llex.o: ./lua/src/llex.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/llex.c lua_lmem.o: ./lua/src/lmem.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lmem.c lua_lobject.o: ./lua/src/lobject.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lobject.c lua_lopcodes.o: ./lua/src/lopcodes.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lopcodes.c lua_lparser.o: ./lua/src/lparser.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lparser.c lua_lstate.o: ./lua/src/lstate.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lstate.c lua_lstring.o: ./lua/src/lstring.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lstring.c lua_ltable.o: ./lua/src/ltable.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltable.c lua_ltests.o: ./lua/src/ltests.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltests.c lua_ltm.o: ./lua/src/ltm.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/ltm.c lua_lundump.o: ./lua/src/lundump.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lundump.c lua_lvm.o: ./lua/src/lvm.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lvm.c lua_lzio.o: ./lua/src/lzio.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lzio.c lua_lua.o: ./lua/src/lua/lua.c $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lua/lua.c wxlua_internal.o: ./wxlua/src/internal.cpp $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/internal.cpp wxlua_interp.o: ./wxlua/src/interp.cpp $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/interp.cpp wxlua_library.o: ./wxlua/src/library.cpp $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/library.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d .PHONY: all install uninstall clean distclean |
|
From: Francesco <fr...@us...> - 2005-06-14 20:23:02
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22666 Modified Files: autoconf_inc.m4 Log Message: Fixing makefiles Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/autoconf_inc.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** autoconf_inc.m4 12 Jun 2005 22:09:12 -0000 1.3 --- autoconf_inc.m4 14 Jun 2005 20:22:48 -0000 1.4 *************** *** 1,3 **** ! dnl ### begin block 00_header[modules.bkl,util.bkl,wxlua.bkl] ### dnl dnl This macro was generated by --- 1,3 ---- ! dnl ### begin block 00_header[apps.bkl,modules.bkl,util.bkl,wxlua.bkl] ### dnl dnl This macro was generated by *************** *** 7,11 **** BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.8" ! dnl ### begin block 20_COND_DEPS_TRACKING_0[modules.bkl,util.bkl,wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then --- 7,11 ---- BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.8" ! dnl ### begin block 20_COND_DEPS_TRACKING_0[apps.bkl,modules.bkl,util.bkl,wxlua.bkl] ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then *************** *** 13,17 **** fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[modules.bkl,util.bkl,wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then --- 13,17 ---- fi AC_SUBST(COND_DEPS_TRACKING_0) ! dnl ### begin block 20_COND_DEPS_TRACKING_1[apps.bkl,modules.bkl,util.bkl,wxlua.bkl] ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then *************** *** 19,23 **** fi AC_SUBST(COND_DEPS_TRACKING_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[modules.bkl,util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then --- 19,23 ---- fi AC_SUBST(COND_DEPS_TRACKING_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[apps.bkl,modules.bkl,util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then |
