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-11-25 22:00:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22256/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: make it compile in VS6, wxLua is a windows app NOT console Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** splttree.cpp 17 Nov 2005 05:51:21 -0000 1.4 --- splttree.cpp 25 Nov 2005 22:00:36 -0000 1.5 *************** *** 444,448 **** --- 444,453 ---- wxTreeItemIdValue cookie; wxTreeItemId childId = GetFirstChild(id, cookie); + + #if wxCHECK_VERSION(2,7,0) + while (childId != wxTreeItemId((void*)0)) + #else //!wxCHECK_VERSION(2,7,0) while (childId != wxTreeItemId((long)0)) + #endif //wxCHECK_VERSION(2,7,0) { CalcTreeSize(childId, rect); |
|
From: John L. <jr...@us...> - 2005-11-25 22:00:47
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22256/wxLua/apps/build/msw Modified Files: apps.dsp Log Message: make it compile in VS6, wxLua is a windows app NOT console Index: apps.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps.dsp 25 Nov 2005 20:21:47 -0000 1.3 --- apps.dsp 25 Nov 2005 22:00:36 -0000 1.4 *************** *** 3,7 **** # ** DO NOT EDIT ** ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=app_wxlua - Win32 Default --- 3,7 ---- # ** DO NOT EDIT ** ! # TARGTYPE "Win32 (x86) Application" 0x0101 CFG=app_wxlua - Win32 Default *************** *** 18,29 **** !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE --- 18,29 ---- !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 DLL Debug" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 DLL" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 Unicode" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Application") ! !MESSAGE "app_wxlua - Win32 Default" (based on "Win32 (x86) Application") !MESSAGE *************** *** 55,60 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode" --- 55,60 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_html.lib wxbase26ud_net.lib wxmsw26ud_xrc.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_html.lib wxbase26ud_net.lib wxmsw26ud_xrc.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode" *************** *** 78,83 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" --- 78,83 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_stc.lib wxmsw26u_html.lib wxbase26u_net.lib wxmsw26u_xrc.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_stc.lib wxmsw26u_html.lib wxbase26u_net.lib wxmsw26u_xrc.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" *************** *** 101,106 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL" --- 101,106 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_stc.lib wxmsw26d_html.lib wxbase26d_net.lib wxmsw26d_xrc.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_stc.lib wxmsw26d_html.lib wxbase26d_net.lib wxmsw26d_xrc.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL" *************** *** 124,129 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" --- 124,129 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_stc.lib wxmsw26_html.lib wxbase26_net.lib wxmsw26_xrc.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_stc.lib wxmsw26_html.lib wxbase26_net.lib wxmsw26_xrc.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" *************** *** 147,152 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode" --- 147,152 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_html.lib wxbase26ud_net.lib wxmsw26ud_xrc.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_html.lib wxbase26ud_net.lib wxmsw26ud_xrc.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode" *************** *** 170,175 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" --- 170,175 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_stc.lib wxmsw26u_html.lib wxbase26u_net.lib wxmsw26u_xrc.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_stc.lib wxmsw26u_html.lib wxbase26u_net.lib wxmsw26u_xrc.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" *************** *** 193,198 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Default" --- 193,198 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_stc.lib wxmsw26d_html.lib wxbase26d_net.lib wxmsw26d_xrc.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:windows /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 /VERBOSE:LIB /NODEFAULTLIB:MSVCRT.lib wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_stc.lib wxmsw26d_html.lib wxbase26d_net.lib wxmsw26d_xrc.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:windows /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Default" *************** *** 210,213 **** --- 210,214 ---- # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c + # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i ..\..\..\modules # ADD RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i ..\..\..\modules *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ENDIF --- 217,222 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_stc.lib wxmsw26_html.lib wxbase26_net.lib wxmsw26_xrc.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_stc.lib wxmsw26_html.lib wxbase26_net.lib wxmsw26_xrc.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ENDIF *************** *** 252,264 **** # Begin Source File ! SOURCE=..\..\wxlua\include\editor.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\lconsole.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlua.h # End Source File # End Group --- 253,265 ---- # Begin Source File ! SOURCE=..\..\wxlua\src\editor.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\lconsole.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlua.h # End Source File # End Group |
|
From: John L. <jr...@us...> - 2005-11-25 22:00:45
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22256/wxLua/modules/build/msw Modified Files: modules_mod_lua_lib.dsp Log Message: make it compile in VS6, wxLua is a windows app NOT console Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules_mod_lua_lib.dsp 20 Jun 2005 09:48:37 -0000 1.1 --- modules_mod_lua_lib.dsp 25 Nov 2005 22:00:36 -0000 1.2 *************** *** 47,52 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 47,52 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 70,75 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 70,75 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 93,98 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 93,98 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 116,121 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 116,121 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 139,144 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 139,144 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 162,167 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 162,167 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 185,190 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 185,190 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 208,213 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 208,213 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WXLUA_CODE" /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 |
|
From: John L. <jr...@us...> - 2005-11-25 22:00:44
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22256/wxLua/bindings/wxwidgets Modified Files: dialogs.i Log Message: make it compile in VS6, wxLua is a windows app NOT console Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dialogs.i 20 Nov 2005 04:09:46 -0000 1.5 --- dialogs.i 25 Nov 2005 22:00:36 -0000 1.6 *************** *** 103,107 **** wxColourData() bool GetChooseFull() const ! wxColour& GetColour() const wxColour GetCustomColour(int i) const void SetChooseFull(bool flag) --- 103,107 ---- wxColourData() bool GetChooseFull() const ! wxColour GetColour() const wxColour GetCustomColour(int i) const void SetChooseFull(bool flag) *************** *** 255,259 **** void EnableEffects(bool enable) bool GetAllowSymbols() ! wxColour& GetColour() wxFont GetChosenFont() bool GetEnableEffects() --- 255,259 ---- void EnableEffects(bool enable) bool GetAllowSymbols() ! wxColour GetColour() wxFont GetChosenFont() bool GetEnableEffects() |
|
From: John L. <jr...@us...> - 2005-11-25 22:00:44
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22256/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: make it compile in VS6, wxLua is a windows app NOT console Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlua.cpp 19 Nov 2005 07:08:39 -0000 1.5 --- wxlua.cpp 25 Nov 2005 22:00:36 -0000 1.6 *************** *** 59,63 **** public: - static wxLuaHandler* sm_luahandler; wxLuaStandaloneApp *m_app; }; --- 59,62 ---- |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:58
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/apps/build/msw Modified Files: apps.dsp Log Message: update dsp files (by hand) Index: apps.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** apps.dsp 20 Jun 2005 09:48:35 -0000 1.2 --- apps.dsp 25 Nov 2005 20:21:47 -0000 1.3 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps.mak" CFG="app_wxlua - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "app_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "apps.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "apps.mak" CFG="app_wxlua - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "app_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") *************** *** 26,30 **** !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "app_wxlua - Win32 Default" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "app_wxlua - Win32 Default" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project *************** *** 246,253 **** SOURCE=..\..\wxlua\src\wxlua.rc # End Source File - # Begin Source File - - SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.c - # End Source File # End Group # Begin Group "Header Files" --- 246,249 ---- |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/modules/wxluasocket/src Modified Files: wxluasocket_wx26.dsp Log Message: update dsp files (by hand) Index: wxluasocket_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluasocket_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.1 --- wxluasocket_wx26.dsp 25 Nov 2005 20:21:48 -0000 1.2 *************** *** 9,25 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak" CFG="wxLuaSocketLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaSocketLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaSocketLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 9,25 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaSocketLib_wx26.mak" CFG="wxLuaSocketLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaSocketLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaSocketLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 87,119 **** # Begin Source File ! SOURCE=..\include\debugio.h # End Source File # Begin Source File ! SOURCE=..\include\dserver.h # End Source File # Begin Source File ! SOURCE=..\include\dtarget.h # End Source File # Begin Source File ! SOURCE=..\include\socket.h # End Source File # Begin Source File ! SOURCE=.\debugio.cpp # End Source File # Begin Source File ! SOURCE=.\dserver.cpp # End Source File # Begin Source File ! SOURCE=.\dtarget.cpp # End Source File # Begin Source File ! SOURCE=.\socket.cpp # End Source File # End Target --- 87,127 ---- # Begin Source File ! SOURCE=..\include\wxldbgio.h # End Source File # Begin Source File ! SOURCE=..\include\wxldserv.h # End Source File # Begin Source File ! SOURCE=..\include\wxldtarg.h # End Source File # Begin Source File ! SOURCE=..\include\wxlsock.h # End Source File # Begin Source File ! SOURCE=..\include\wxlhandl.h # End Source File # Begin Source File ! SOURCE=.\wxldbgio.cpp # End Source File # Begin Source File ! SOURCE=.\wxldserv.cpp # End Source File # Begin Source File ! SOURCE=.\wxldtarg.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=.\wxlsock.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=.\wxlhandl.cpp # End Source File # End Target |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/modules/wxlua/src Modified Files: wxlualib_wx26.dsp Log Message: update dsp files (by hand) Index: wxlualib_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlualib_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlualib_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.1 --- wxlualib_wx26.dsp 25 Nov 2005 20:21:48 -0000 1.2 *************** *** 9,25 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak" CFG="wxLuaLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 9,25 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaLib_wx26.mak" CFG="wxLuaLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 87,95 **** # Begin Source File ! SOURCE=..\include\callback.h # End Source File # Begin Source File ! SOURCE=..\include\defs.h # End Source File # Begin Source File --- 87,95 ---- # Begin Source File ! SOURCE=..\include\wxlcallb.h # End Source File # Begin Source File ! SOURCE=..\include\wxldefs.h # End Source File # Begin Source File *************** *** 99,107 **** # Begin Source File ! SOURCE=..\include\interp.h # End Source File # Begin Source File ! SOURCE=..\include\library.h # End Source File # Begin Source File --- 99,111 ---- # Begin Source File ! SOURCE=..\include\wxlintrp.h # End Source File # Begin Source File ! SOURCE=..\include\wxlbind.h ! # End Source File ! # Begin Source File ! ! SOURCE=..\include\wxlstate.h # End Source File # Begin Source File *************** *** 115,123 **** # Begin Source File ! SOURCE=.\interp.cpp # End Source File # Begin Source File ! SOURCE=.\library.cpp # End Source File # End Target --- 119,135 ---- # Begin Source File ! SOURCE=.\wxlintrp.cpp # End Source File # Begin Source File ! SOURCE=.\wxlcallb.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=.\wxlbind.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=.\wxlstate.cpp # End Source File # End Target |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/modules/wxluadebug/src Modified Files: wxluadebug_wx26.dsp Log Message: update dsp files (by hand) Index: wxluadebug_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxluadebug_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluadebug_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.1 --- wxluadebug_wx26.dsp 25 Nov 2005 20:21:48 -0000 1.2 *************** *** 9,25 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak" CFG="wxLuaDebugLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaDebugLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaDebugLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 9,25 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaDebugLib_wx26.mak" CFG="wxLuaDebugLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaDebugLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaDebugLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 87,91 **** # Begin Source File ! SOURCE=..\include\debug.h # End Source File # Begin Source File --- 87,91 ---- # Begin Source File ! SOURCE=..\include\wxldebug.h # End Source File # Begin Source File *************** *** 99,103 **** # Begin Source File ! SOURCE=.\debug.cpp # End Source File # Begin Source File --- 99,103 ---- # Begin Source File ! SOURCE=.\wxldebug.cpp # End Source File # Begin Source File |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:56
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/modules/build/msw Modified Files: modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: update dsp files (by hand) Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules_mod_wxbind.dsp 20 Jun 2005 09:48:37 -0000 1.1 --- modules_mod_wxbind.dsp 25 Nov 2005 20:21:47 -0000 1.2 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak" CFG="mod_wxbind - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxbind - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbind - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbind.mak" CFG="mod_wxbind - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxbind - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbind - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxbind - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbind - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxbind - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbind - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 357,360 **** --- 357,364 ---- # Begin Source File + SOURCE=..\..\wxbind\src\wx_builtin.cpp + # End Source File + # Begin Source File + SOURCE=..\..\wxbind\src\wx_class.cpp # End Source File Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules_mod_wxlua.dsp 20 Jun 2005 09:48:37 -0000 1.1 --- modules_mod_wxlua.dsp 25 Nov 2005 20:21:47 -0000 1.2 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 249,257 **** # Begin Source File ! SOURCE=..\..\wxlua\src\interp.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\library.cpp # End Source File # End Group --- 249,265 ---- # Begin Source File ! SOURCE=..\..\wxlua\src\wxlintrp.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxlua\src\wxlbind.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxlua\src\wxlcallb.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxlua\src\wxlstate.cpp # End Source File # End Group *************** *** 261,269 **** # Begin Source File ! SOURCE=..\..\wxlua\include\callback.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\defs.h # End Source File # Begin Source File --- 269,277 ---- # Begin Source File ! SOURCE=..\..\wxlua\include\wxlcallb.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxldefs.h # End Source File # Begin Source File *************** *** 273,281 **** # Begin Source File ! SOURCE=..\..\wxlua\include\interp.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\library.h # End Source File # Begin Source File --- 281,293 ---- # Begin Source File ! SOURCE=..\..\wxlua\include\wxlintrp.h # End Source File # Begin Source File ! SOURCE=..\..\wxlua\include\wxlbind.h ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxlua\include\wxlstate.h # End Source File # Begin Source File Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules_mod_wxluasocket.dsp 20 Jun 2005 09:48:37 -0000 1.1 --- modules_mod_wxluasocket.dsp 25 Nov 2005 20:21:47 -0000 1.2 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak" CFG="mod_wxluasocket - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxluasocket - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak" CFG="mod_wxluasocket - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxluasocket - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxluasocket - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluasocket - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxluasocket - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluasocket - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 245,261 **** # Begin Source File ! SOURCE=..\..\wxluasocket\src\debugio.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\dserver.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\dtarget.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\socket.cpp # End Source File # End Group --- 245,265 ---- # Begin Source File ! SOURCE=..\..\wxluasocket\src\wxldbgio.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\wxlhandl.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\wxldserv.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\src\wxldtarg.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxluasocket\src\wxlsock.cpp # End Source File # End Group *************** *** 265,281 **** # Begin Source File ! SOURCE=..\..\wxluasocket\include\debugio.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\dserver.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\dtarget.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\socket.h # End Source File # End Group --- 269,289 ---- # Begin Source File ! SOURCE=..\..\wxluasocket\include\wxldbgio.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\wxlhandl.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\wxldserv.h # End Source File # Begin Source File ! SOURCE=..\..\wxluasocket\include\wxldtarg.h ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxluasocket\include\wxlsock.h # End Source File # End Group Index: modules_mod_wxluadebug.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluadebug.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules_mod_wxluadebug.dsp 20 Jun 2005 09:48:37 -0000 1.1 --- modules_mod_wxluadebug.dsp 25 Nov 2005 20:21:47 -0000 1.2 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluadebug.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluadebug.mak" CFG="mod_wxluadebug - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxluadebug - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluadebug - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluadebug.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluadebug.mak" CFG="mod_wxluadebug - Win32 Default" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxluadebug - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluadebug - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxluadebug - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluadebug - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxluadebug - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluadebug - Win32 Default" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 245,249 **** # Begin Source File ! SOURCE=..\..\wxluadebug\src\debug.cpp # End Source File # Begin Source File --- 245,249 ---- # Begin Source File ! SOURCE=..\..\wxluadebug\src\wxldebug.cpp # End Source File # Begin Source File *************** *** 261,265 **** # Begin Source File ! SOURCE=..\..\wxluadebug\include\debug.h # End Source File # Begin Source File --- 261,265 ---- # Begin Source File ! SOURCE=..\..\wxluadebug\include\wxldebug.h # End Source File # Begin Source File |
|
From: John L. <jr...@us...> - 2005-11-25 20:21:55
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064/wxLua/modules/wxbind/src Modified Files: wxluabind_wx26.dsp Log Message: update dsp files (by hand) Index: wxluabind_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxluabind_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluabind_wx26.dsp 18 Jun 2005 20:53:41 -0000 1.1 --- wxluabind_wx26.dsp 25 Nov 2005 20:21:48 -0000 1.2 *************** *** 9,25 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaBindLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaBindLib_wx26.mak" CFG="wxLuaBindLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaBindLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaBindLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 9,25 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wxLuaBindLib_wx26.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wxLuaBindLib_wx26.mak" CFG="wxLuaBindLib_wx26 - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wxLuaBindLib_wx26 - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxLuaBindLib_wx26 - Win32 Debug" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 219,222 **** --- 219,226 ---- # Begin Source File + SOURCE=.\wx_builtin.cpp + # End Source File + # Begin Source File + SOURCE=.\wx_class.cpp # End Source File |
|
From: John L. <jr...@us...> - 2005-11-25 20:04:43
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31733/wxLua/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebake Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.vc 24 Nov 2005 21:34:16 -0000 1.8 --- makefile.vc 25 Nov 2005 20:04:35 -0000 1.9 *************** *** 60,66 **** WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 60,67 ---- WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.bcc 24 Nov 2005 21:34:16 -0000 1.7 --- makefile.bcc 25 Nov 2005 20:04:34 -0000 1.8 *************** *** 90,93 **** --- 90,103 ---- !endif + # The folder where wxluasetup.h is searched + !ifndef WXLUASETUP_DIR + WXLUASETUP_DIR = ..\..\modules\wxbind\src + !endif + + # The folder where wxLuaBind library is sent + !ifndef WXLUABINDLIB_DIR + WXLUABINDLIB_DIR = ..\..\lib + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 125,130 **** -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ ! -DUSE_UTIL="$(USE_UTIL)" -DUSE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 135,142 ---- -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DWXLUASETUP_DIR="$(WXLUASETUP_DIR)" \ ! -DWXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" -DUSE_UTIL="$(USE_UTIL)" \ ! -DUSE_APPS="$(USE_APPS)" ### Conditionally set variables: ### Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.wat 24 Nov 2005 21:34:16 -0000 1.7 --- makefile.wat 25 Nov 2005 20:04:35 -0000 1.8 *************** *** 86,92 **** WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" & ! USE_APPS="$(USE_APPS)" --- 86,93 ---- WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" & USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" & ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** makefile.gcc 24 Nov 2005 21:34:16 -0000 1.7 --- makefile.gcc 25 Nov 2005 20:04:35 -0000 1.8 *************** *** 60,66 **** WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" USE_UTIL="$(USE_UTIL)" \ ! USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### --- 60,67 ---- WX_VERSION="$(WX_VERSION)" USE_BIN2C="$(USE_BIN2C)" \ USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ ! USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" ### Conditionally set variables: ### |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:48
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxldbgio.cpp Log Message: debug.h/cpp to wxldebug for completeness Index: wxldbgio.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldbgio.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxldbgio.cpp 25 Nov 2005 19:22:58 -0000 1.1 --- wxldbgio.cpp 25 Nov 2005 19:45:37 -0000 1.2 *************** *** 25,29 **** #include "wxluasocket/include/wxlsock.h" #include "wxlua/include/internal.h" ! #include "wxluadebug/include/debug.h" // ---------------------------------------------------------------------------- --- 25,29 ---- #include "wxluasocket/include/wxlsock.h" #include "wxlua/include/internal.h" ! #include "wxluadebug/include/wxldebug.h" // ---------------------------------------------------------------------------- Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dservice.cpp 25 Nov 2005 18:52:22 -0000 1.2 --- dservice.cpp 25 Nov 2005 19:45:37 -0000 1.3 *************** *** 33,38 **** #endif ! #include "wxlua/dservice.h" ! #include "wxlua/dserver.h" #include <wx/listimpl.cpp> --- 33,37 ---- #endif ! #include "wxluasocket/include/dservice.h" #include <wx/listimpl.cpp> |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:48
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules Modified Files: Makefile.in Log Message: debug.h/cpp to wxldebug for completeness Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 25 Nov 2005 19:22:57 -0000 1.12 --- Makefile.in 25 Nov 2005 19:45:36 -0000 1.13 *************** *** 166,170 **** WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! wxluadebug_lib_debug.o \ wxluadebug_lib_splttree.o \ wxluadebug_lib_staktree.o --- 166,170 ---- WXLUADEBUG_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! wxluadebug_lib_wxldebug.o \ wxluadebug_lib_splttree.o \ wxluadebug_lib_staktree.o *************** *** 172,176 **** $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! wxluadebug_dll_debug.o \ wxluadebug_dll_splttree.o \ wxluadebug_dll_staktree.o --- 172,176 ---- $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! wxluadebug_dll_wxldebug.o \ wxluadebug_dll_splttree.o \ wxluadebug_dll_staktree.o *************** *** 714,719 **** $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/xml.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 --- 714,719 ---- $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) ./wxbind/src/xml.cpp ! wxluadebug_lib_wxldebug.o: ./wxluadebug/src/wxldebug.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/wxldebug.cpp wxluadebug_lib_splttree.o: ./wxluadebug/src/splttree.cpp *************** *** 723,728 **** $(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 --- 723,728 ---- $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) ./wxluadebug/src/staktree.cpp ! wxluadebug_dll_wxldebug.o: ./wxluadebug/src/wxldebug.cpp ! $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) ./wxluadebug/src/wxldebug.cpp wxluadebug_dll_splttree.o: ./wxluadebug/src/splttree.cpp |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:47
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/build/bakefiles Modified Files: sources.bkl Log Message: debug.h/cpp to wxldebug for completeness Index: sources.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sources.bkl 25 Nov 2005 19:22:57 -0000 1.10 --- sources.bkl 25 Nov 2005 19:45:36 -0000 1.11 *************** *** 147,151 **** <!-- ================================================================== --> <set var="wxluadebug_src"> ! wxluadebug/src/debug.cpp wxluadebug/src/splttree.cpp wxluadebug/src/staktree.cpp --- 147,151 ---- <!-- ================================================================== --> <set var="wxluadebug_src"> ! wxluadebug/src/wxldebug.cpp wxluadebug/src/splttree.cpp wxluadebug/src/staktree.cpp *************** *** 153,157 **** <set var="wxluadebug_hdr"> ! wxluadebug/include/debug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h --- 153,157 ---- <set var="wxluadebug_hdr"> ! wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/wxluasocket/include Modified Files: dservice.h wxldserv.h wxldtarg.h Log Message: debug.h/cpp to wxldebug for completeness Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxldserv.h 25 Nov 2005 19:22:58 -0000 1.1 --- wxldserv.h 25 Nov 2005 19:45:36 -0000 1.2 *************** *** 16,20 **** #include "wx/process.h" #include "wxlua/include/wxldefs.h" ! #include "wxluadebug/include/debug.h" #include "wxluasocket/include/wxlsock.h" #include "wxluasocket/include/wxldbgio.h" --- 16,20 ---- #include "wx/process.h" #include "wxlua/include/wxldefs.h" ! #include "wxluadebug/include/wxldebug.h" #include "wxluasocket/include/wxlsock.h" #include "wxluasocket/include/wxldbgio.h" Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxldtarg.h 25 Nov 2005 19:22:58 -0000 1.1 --- wxldtarg.h 25 Nov 2005 19:45:36 -0000 1.2 *************** *** 19,23 **** #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" ! #include "wxluadebug/include/debug.h" #include "wxluadebug/include/staktree.h" #include "wxluasocket/include/wxldbgio.h" --- 19,23 ---- #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" ! #include "wxluadebug/include/wxldebug.h" #include "wxluadebug/include/staktree.h" #include "wxluasocket/include/wxldbgio.h" Index: dservice.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dservice.h 25 Nov 2005 18:52:22 -0000 1.3 --- dservice.h 25 Nov 2005 19:45:36 -0000 1.4 *************** *** 39,43 **** #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" ! #include "wxluadebug/include/dserver.h" #define SERVER_ID 1200 --- 39,43 ---- #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" ! #include "wxluasocket/include/wxldserv.h" #define SERVER_ID 1200 |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/wxluadebug/include Added Files: wxldebug.h Removed Files: debug.h Log Message: debug.h/cpp to wxldebug for completeness --- debug.h DELETED --- --- NEW FILE: wxldebug.h --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Implements the debugger end of wxLua debugging session // Author: J. Winwood // Created: June 2003 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // Ray Gilbert moved class definitions out of wxLuaDebugServer, wxLuaDebugIO // to allow alternate debugger model // // Original Debugging Model: // wxLuaDebugServer, LuaDebugTarget // The current process acts as a server - debugger (wxLuaDebugServer) // starts a new process which starts up as a client - debuggee (LuaDebugTarget) // that connects back to server process. // // Alternative Debugging Model: // wxLuaDebugService, wxLuaDebuggee, wxLuaDebugger // The current process acts as a server - debuggee (wxLuaDebugService; wxLuaDebuggee). // This service waits for client - debugger to connect. #ifndef WX_LUA_DEBUG_H #define WX_LUA_DEBUG_H #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "wxldebug.h" #endif #include "wx/dynarray.h" #include "wx/treectrl.h" // for wxTreeItemData #include "wxlua/include/wxldefs.h" class WXDLLIMPEXP_WXLUA wxLuaDebugData; // ---------------------------------------------------------------------------- // wxLuaBuffer // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaBuffer : public wxObject { public: wxLuaBuffer(const wxString &fileName, const wxString &buffer); wxString GetBuffer() const { return m_buffer; } wxString GetFileName() const { return m_fileName; } int GetBufferLength() const { return m_buffer.Length(); } private: wxString m_fileName; wxString m_buffer; DECLARE_CLASS(wxLuaBuffer) }; #if wxCHECK_VERSION(2, 5, 0) WX_DEFINE_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray); #else WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray); #endif // !wxCHECK_VERSION(2, 5, 0) // ---------------------------------------------------------------------------- // wxLuaDebugDataItem // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugDataItem : public wxTreeItemData { public: wxLuaDebugDataItem(const wxLuaDebugDataItem &debugDataItem); wxLuaDebugDataItem(const wxString &itemName, const wxString &itemType, const wxString &itemValue, const wxString &itemSource, int nReference, int nIndex = 0, bool fExpanded = false); wxString GetName() const { return m_itemName; } wxString GetType() const { return m_itemType; } wxString GetValue() const { return m_itemValue; } wxString GetSource() const { return m_itemSource; } int GetReference() const { return m_nReference; } int GetIndex() const { return m_nIndex; } bool IsExpanded() const { return m_fExpanded; } void SetExpanded(bool fExpanded) { m_fExpanded = fExpanded; } private: wxString m_itemName; wxString m_itemType; wxString m_itemValue; wxString m_itemSource; int m_nReference; int m_nIndex; bool m_fExpanded; }; WX_DEFINE_SORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray); // ---------------------------------------------------------------------------- // wxLuaDebugData // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugData : public wxLuaDebugDataItemArray { public: wxLuaDebugData(); virtual ~wxLuaDebugData(); wxLuaDebugData *Clone(); static int SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 ); }; // ---------------------------------------------------------------------------- // wxLuaInterface // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaInterface { public: wxLuaInterface(lua_State *luaState); virtual ~wxLuaInterface(); wxLuaDebugData *BuildStack(); wxLuaDebugData *BuildStackList(int nEntry); wxLuaDebugData *BuildTableList(int nRef, int nEntry); wxLuaDebugData *GetGlobalData(); lua_State *GetLuaState() const { return m_luaState; } private: int GetStack(int nIndex, lua_Debug *luaDebug); bool GetInfo(const wxString &opts, lua_Debug *luaDebug); wxString GetLocal(lua_Debug *luaDebug, int index); void GetGlobals(); int GetTop(); int Type(int index); double ToNumber(int index); int ToBoolean(int index); wxString ToString(int index); const void *ToPointer(int index); bool IsCFunction(int index); const void *ToCFunction(int index); const void *ToUserData(int index); int GetTag(int index); int GetN(int index); int Ref(); int GetRef(int ref); void Pop(int count); void PushNil(); void PushValue(int index); int Next(int index); bool IsLuaTable(int index) const; wxString GetTableInfo(int index); wxString GetUserDataInfo(int index, bool full = true); static wxString MakeNumber(double dnum); static wxString MakeBoolean(int num); lua_State *m_luaState; wxArrayInt m_references; }; // ---------------------------------------------------------------------------- // wxLuaDebugEvents_Type // ---------------------------------------------------------------------------- enum debugEvents // FIXME prefix wxLUA on these { EVENT_DEBUG_BREAK, EVENT_DEBUG_PRINT, EVENT_DEBUG_ERROR, EVENT_DEBUG_EXIT, EVENT_DEBUG_STACK_ENUM, EVENT_DEBUG_STACK_ENTRY_ENUM, EVENT_DEBUG_TABLE_ENUM, EVENT_DEBUG_EVALUATE_EXPR, EVENT_DEBUG_BREAKPOINT_ADDED, EVENT_DEBUG_BREAKPOINT_REMOVED }; // ---------------------------------------------------------------------------- // wxLuaDebugCommands_Type // ---------------------------------------------------------------------------- enum debugCommands // FIXME prefix wxLUA on these { CMD_ADD_BREAKPOINT, CMD_REMOVE_BREAKPOINT, CMD_CLEAR_ALL_BREAKPOINTS, CMD_RUN_BUFFER, CMD_DEBUG_STEP, CMD_DEBUG_STEPOVER, CMD_DEBUG_STEPOUT, CMD_DEBUG_CONTINUE, CMD_DEBUG_BREAK, CMD_ENUMERATE_STACK, CMD_ENUMERATE_STACK_ENTRY, CMD_ENUMERATE_TABLE_REF, CMD_EVALUATE_EXPR, CMD_RESET, CMD_CLEAR_DEBUG_REFERENCES, CMD_DISABLE_BREAKPOINT, CMD_ENABLE_BREAKPOINT }; // ---------------------------------------------------------------------------- // wxLuaDebuggerBase - Debugger interface base class // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebuggerBase : public wxEvtHandler { public: wxLuaDebuggerBase() {} virtual ~wxLuaDebuggerBase() {} virtual bool AddBreakPoint(const wxString &fileName, int lineNumber) = 0; virtual bool RemoveBreakPoint(const wxString &fileName, int lineNumber) = 0; virtual bool ClearAllBreakPoints() = 0; virtual bool Run(const wxString &fileName, const wxString &buffer) = 0; virtual bool Step() = 0; virtual bool StepOver() = 0; virtual bool StepOut() = 0; virtual bool Continue() = 0; virtual bool Break() = 0; virtual bool Reset() = 0; virtual bool EnumerateStack() = 0; virtual bool EnumerateStackEntry(int stackEntry) = 0; virtual bool EnumerateTable(int tableRef, int nIndex, int nItemNode) = 0; virtual bool CleanupDebugReferences() = 0; private: DECLARE_CLASS(wxLuaDebuggerBase) }; // ---------------------------------------------------------------------------- // wxLuaDebugEvent // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugEvent : public wxEvent { public: wxLuaDebugEvent(); wxLuaDebugEvent(int eventType); wxLuaDebugEvent(int eventType, int lineNumber, const wxString &fileName, bool enabledFlag = false); virtual ~wxLuaDebugEvent(); void SetMessage(const wxString &message); void SetDebugData(int nReference, wxLuaDebugData *pDebugData = NULL); int GetLineNumber() const; wxString GetFileName() const; wxString GetMessage() const; int GetReference() const; const wxLuaDebugData *GetDebugData() const; bool GetEnabledFlag() const; protected: virtual wxEvent* Clone() const; private: bool m_fHasMessage; bool m_fEnabledFlag; int m_lineNumber; wxString m_fileName; wxString m_strMessage; int m_nReference; wxLuaDebugData *m_pDebugData; DECLARE_DYNAMIC_CLASS(wxLuaDebugEvent) }; typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&); // FIXME prefix wxLUA on these BEGIN_DECLARE_EVENT_TYPES() DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED, 2510) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAK, 2511) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_PRINT, 2512) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_ERROR, 2513) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EXIT, 2514) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM, 2515) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM, 2516) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM, 2517) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR, 2518) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER, 2519) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER, 2520) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED, 2521) DECLARE_LOCAL_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() #define EVT_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_PRINT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_ERROR, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EXIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_STACK_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENUM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_STACK_ENTRY_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STACK_ENTRY_ENUM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_TABLE_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_TABLE_ENUM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_EVALUATE_EXPR, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_STARTDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STARTDEBUGGER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_STOPDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_STOPDEBUGGER, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_BREAKPOINT_ADDED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_ADDED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #define EVT_DEBUG_BREAKPOINT_REMOVED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_DEBUG_BREAKPOINT_REMOVED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxLuaDebugEventFunction) & fn, (wxObject *) NULL), #endif // WX_LUA_DEBUG_H |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/wxluadebug/src Modified Files: Makefile Added Files: wxldebug.cpp Removed Files: debug.cpp Log Message: debug.h/cpp to wxldebug for completeness --- NEW FILE: wxldebug.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaDebug.cpp // Purpose: Debugging I/O functions for wxLua // Author: J. Winwood // Created: May 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // Ray Gilbert #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "wxldebug.h" #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluadebug/include/wxldebug.h" #include "wxlua/include/internal.h" DEFINE_EVENT_TYPE(wxEVT_DEBUG_CLIENT_CONNECTED) DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAK) DEFINE_EVENT_TYPE(wxEVT_DEBUG_PRINT) DEFINE_EVENT_TYPE(wxEVT_DEBUG_ERROR) DEFINE_EVENT_TYPE(wxEVT_DEBUG_EXIT) DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENUM) DEFINE_EVENT_TYPE(wxEVT_DEBUG_STACK_ENTRY_ENUM) DEFINE_EVENT_TYPE(wxEVT_DEBUG_TABLE_ENUM) DEFINE_EVENT_TYPE(wxEVT_DEBUG_EVALUATE_EXPR) DEFINE_EVENT_TYPE(wxEVT_DEBUG_STARTDEBUGGER) DEFINE_EVENT_TYPE(wxEVT_DEBUG_STOPDEBUGGER) DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_ADDED) DEFINE_EVENT_TYPE(wxEVT_DEBUG_BREAKPOINT_REMOVED) // ---------------------------------------------------------------------------- // wxLuaBuffer // ---------------------------------------------------------------------------- IMPLEMENT_CLASS(wxLuaBuffer, wxObject) wxLuaBuffer::wxLuaBuffer(const wxString &fileName, const wxString &buffer) : m_fileName(fileName), m_buffer(buffer) { } // ---------------------------------------------------------------------------- // wxLuaDebuggerBase // ---------------------------------------------------------------------------- IMPLEMENT_CLASS(wxLuaDebuggerBase, wxEvtHandler) // ---------------------------------------------------------------------------- // wxLuaDebugEvent // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxLuaDebugEvent, wxEvent) wxLuaDebugEvent::wxLuaDebugEvent() { m_fHasMessage = false; m_pDebugData = NULL; m_nReference = -1; m_fEnabledFlag = false; } wxLuaDebugEvent::wxLuaDebugEvent(int eventType) { SetEventType(eventType); m_fHasMessage = false; m_pDebugData = NULL; m_nReference = -1; m_fEnabledFlag = false; } wxLuaDebugEvent::wxLuaDebugEvent(int eventType, int lineNumber, const wxString &file, bool enabledFlag) { SetEventType(eventType); m_lineNumber = lineNumber; m_fileName = file; m_fHasMessage = false; m_nReference = -1; m_pDebugData = NULL; m_fEnabledFlag = enabledFlag; } wxLuaDebugEvent::~wxLuaDebugEvent() { if (m_pDebugData != NULL) delete m_pDebugData; } void wxLuaDebugEvent::SetMessage(const wxString &pMessage) { m_strMessage = pMessage; m_fHasMessage = true; } void wxLuaDebugEvent::SetDebugData(int nReference, wxLuaDebugData *pData) { m_nReference = nReference; m_pDebugData = pData; } int wxLuaDebugEvent::GetLineNumber() const { return m_lineNumber; } wxString wxLuaDebugEvent::GetFileName() const { return m_fileName; } wxString wxLuaDebugEvent::GetMessage() const { return m_strMessage; } bool wxLuaDebugEvent::GetEnabledFlag() const { return m_fEnabledFlag; } const wxLuaDebugData *wxLuaDebugEvent::GetDebugData() const { return m_pDebugData; } int wxLuaDebugEvent::GetReference() const { return m_nReference; } wxEvent *wxLuaDebugEvent::Clone() const { wxLuaDebugEvent *pEvent = new wxLuaDebugEvent(GetEventType(), m_lineNumber, m_fileName); if (pEvent != NULL) { if (m_fHasMessage) pEvent->SetMessage(m_strMessage); if (m_pDebugData != NULL) pEvent->SetDebugData(m_nReference, m_pDebugData->Clone()); else pEvent->SetDebugData(m_nReference); } return pEvent; } // ---------------------------------------------------------------------------- // wxLuaDebugDataItem // ---------------------------------------------------------------------------- wxLuaDebugDataItem::wxLuaDebugDataItem(const wxString &itemName, const wxString &itemType, const wxString &itemValue, const wxString &itemSource, int nReference, int nIndex, bool fExpanded) { m_itemName = itemName; m_itemType = itemType; m_itemValue = itemValue; m_itemSource = itemSource; m_nReference = nReference; m_nIndex = nIndex; m_fExpanded = fExpanded; } wxLuaDebugDataItem::wxLuaDebugDataItem(const wxLuaDebugDataItem &treeItem) { m_itemName = treeItem.m_itemName; m_itemType = treeItem.m_itemType; m_itemValue = treeItem.m_itemValue; m_itemSource = treeItem.m_itemSource; m_nReference = treeItem.m_nReference; m_nIndex = treeItem.m_nIndex; m_fExpanded = treeItem.m_fExpanded; } // ---------------------------------------------------------------------------- // wxLuaDebugData - Debug Info sent via socket to debugger client // ---------------------------------------------------------------------------- wxLuaDebugData::wxLuaDebugData() : wxLuaDebugDataItemArray(SortFunction) { } wxLuaDebugData::~wxLuaDebugData() { size_t idx; for (idx = 0; idx < Count(); ++idx) { const wxLuaDebugDataItem *pData = Item(idx); delete pData; } } wxLuaDebugData *wxLuaDebugData::Clone() { wxLuaDebugData *pCloneData = new wxLuaDebugData; if (pCloneData != NULL) { size_t idx; for (idx = 0; idx < Count(); ++idx) { const wxLuaDebugDataItem *pOldData = Item(idx); if (pOldData != NULL) pCloneData->Add(new wxLuaDebugDataItem(*pOldData)); } } return pCloneData; } int wxLuaDebugData::SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 ) { return wxStrcmp(elem1->GetName(), elem2->GetName()); } // ---------------------------------------------------------------------------- // wxLuaInterface (local) // ---------------------------------------------------------------------------- wxLuaInterface::wxLuaInterface(lua_State *luaState) : m_luaState(luaState) { } wxLuaInterface::~wxLuaInterface() { size_t idx, idxMax = m_references.GetCount(); for (idx = 0; idx < idxMax; ++idx) { int iItem = m_references.Item(idx); tremove(m_luaState, iItem); } } int wxLuaInterface::GetStack(int nIndex, lua_Debug *luaDebug) { return lua_getstack(m_luaState, nIndex, luaDebug); } bool wxLuaInterface::GetInfo(const wxString &what, lua_Debug *luaDebug) { return (lua_getinfo(m_luaState, wx2lua(what), luaDebug) != 0); } wxString wxLuaInterface::GetLocal(lua_Debug *luaDebug, int index) { return lua2wx(lua_getlocal(m_luaState, luaDebug, index)); } void wxLuaInterface::GetGlobals() { lua_pushvalue(m_luaState, LUA_GLOBALSINDEX); } int wxLuaInterface::GetTop() { return lua_gettop(m_luaState); } int wxLuaInterface::Type(int index) { return lua_type(m_luaState, index); } double wxLuaInterface::ToNumber(int index) { return lua_tonumber(m_luaState, index); } int wxLuaInterface::ToBoolean(int index) { return lua_toboolean(m_luaState, index); } wxString wxLuaInterface::ToString(int index) { return lua2wx(lua_tostring(m_luaState, index)); } const void *wxLuaInterface::ToPointer(int index) { return lua_topointer(m_luaState, index); } bool wxLuaInterface::IsCFunction(int index) { return lua_iscfunction(m_luaState, index) != 0; } const void *wxLuaInterface::ToCFunction(int index) { return (const void *) lua_tocfunction(m_luaState, index); } const void *wxLuaInterface::ToUserData(int index) { return lua_touserdata(m_luaState, index); } int wxLuaInterface::GetTag(int index) { return ttag(m_luaState, index); } int wxLuaInterface::GetN(int index) { return luaL_getn(m_luaState, index); } int wxLuaInterface::Ref() { int nReference = tinsert(m_luaState, -1); m_references.Add(nReference); return nReference; } int wxLuaInterface::GetRef(int ref) { return tget(m_luaState, ref); } void wxLuaInterface::Pop(int count) { lua_pop(m_luaState, count); } void wxLuaInterface::PushNil() { lua_pushnil(m_luaState); } void wxLuaInterface::PushValue(int index) { lua_pushvalue(m_luaState, index); } int wxLuaInterface::Next(int index) { return lua_next(m_luaState, index); } wxLuaDebugData *wxLuaInterface::BuildStack() { wxLuaDebugData *pSortedList = new wxLuaDebugData(); int nIndex = 0; lua_Debug luaDebug; bool fFirst = true; while (GetStack(nIndex, &luaDebug) != 0) { if (GetInfo(wxT("Sln"), &luaDebug)) { wxString itemName; wxString source = lua2wx(luaDebug.source); // skip stack frames that do not have line number int currentLine = luaDebug.currentline; if (!fFirst || (currentLine != -1)) { if (currentLine == -1) currentLine = 0; if (luaDebug.name != NULL) itemName.Printf(_("function %s line %u"), luaDebug.name, currentLine); else itemName.Printf(_("line %u"), currentLine); wxLuaDebugDataItem *item = new wxLuaDebugDataItem(itemName, wxT(""), wxT(""), source, nIndex, 0); pSortedList->Add(item); fFirst = false; } } ++nIndex; } return pSortedList; } wxLuaDebugData *wxLuaInterface::BuildStackList(int nEntry) { wxLuaDebugData *pSortedList = new wxLuaDebugData(); if (pSortedList != NULL) { lua_Debug luaDebug; if (GetStack(nEntry, &luaDebug) != 0) { int idx = 1; wxString name = GetLocal(&luaDebug, idx); while (!name.IsEmpty()) { bool fIsTable = false; wxString type; wxString value; wxString source = lua2wx(luaDebug.source); switch (Type(-1)) { case LUA_TNIL: type = wxT("Nil"); value = wxT("nil"); break; case LUA_TBOOLEAN: type = wxT("Boolean"); value = MakeBoolean(ToBoolean(-1)); break; case LUA_TNUMBER: type = wxT("Number"); value = MakeNumber(ToNumber(-1)); break; case LUA_TSTRING: type = wxT("String"); value = ToString(-1); break; case LUA_TTABLE: type = wxT("Table"); value = GetTableInfo(-1); fIsTable = true; break; case LUA_TFUNCTION: if (IsCFunction(-1)) { type = wxT("C Function"); value.Printf(wxT("%p"), ToCFunction(-1)); } else { type = wxT("Lua Function"); value.Printf(wxT("%p"), ToPointer(-1)); } break; case LUA_TUSERDATA: type = wxT("User Data"); value = GetUserDataInfo(-1); break; case LUA_TLIGHTUSERDATA: type = wxT("Light User Data"); value = GetUserDataInfo(-1, false); break; case LUA_TTHREAD: type = wxT("Thread"); value.Printf(wxT("%p"), ToPointer(-1)); break; } int nRef = LUA_NOREF; if (fIsTable) { nRef = Ref(); } else Pop(1); wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, 0); pSortedList->Add(item); name = GetLocal(&luaDebug, ++idx); } } } return pSortedList; } wxLuaDebugData *wxLuaInterface::BuildTableList(int nRef, int nIndex) { wxLuaDebugData *pSortedList = new wxLuaDebugData(); if (pSortedList != NULL && GetRef(nRef) != 0) { int nTop = GetTop(); // start iterating PushNil(); while (Next(nTop) != 0) { bool fIsTable = false; wxString type; wxString value; wxString name; wxString source; // get the index switch (Type(-2)) { case LUA_TNIL: name = wxT("Nil"); break; case LUA_TBOOLEAN: name = MakeBoolean(ToBoolean(-2)); break; case LUA_TNUMBER: name = MakeNumber(ToNumber(-2)); break; case LUA_TSTRING: name = ToString(-2); break; case LUA_TTABLE: name = GetTableInfo(-2); break; case LUA_TFUNCTION: if (IsCFunction(-2)) name.Printf(wxT("%p"), ToCFunction(-2)); else name.Printf(wxT("%p"), ToPointer(-2)); break; case LUA_TUSERDATA: name = GetUserDataInfo(-2); break; case LUA_TLIGHTUSERDATA: name = GetUserDataInfo(-2, false); break; } // get the value switch (Type(-1)) { case LUA_TNIL: type = wxT("Nil"); value = wxT("nil"); break; case LUA_TBOOLEAN: value = MakeBoolean(ToBoolean(-1)); type = wxT("Boolean"); break; case LUA_TNUMBER: value = MakeNumber(ToNumber(-1)); type = wxT("Number"); break; case LUA_TSTRING: type = wxT("String"); value = ToString(-1); break; case LUA_TTABLE: type = wxT("Table"); value = GetTableInfo(-1); fIsTable = true; break; case LUA_TFUNCTION: if (IsCFunction(-1)) { type = wxT("C Function"); value.Printf(wxT("%p"), ToCFunction(-1)); } else { type = wxT("Lua Function"); value.Printf(wxT("%p"), ToPointer(-1)); } break; case LUA_TUSERDATA: type = wxT("User Data"); value = GetUserDataInfo(-1); break; case LUA_TLIGHTUSERDATA: type = wxT("Light User Data"); value = GetUserDataInfo(-1, false); break; case LUA_TTHREAD: type = wxT("Thread"); value.Printf(wxT("%p"), ToPointer(-1)); break; } int nRef = LUA_NOREF; if (fIsTable) nRef = Ref(); else Pop(1); wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex); pSortedList->Add(item); } // remove reference Pop(1); } return pSortedList; } wxString wxLuaInterface::GetTableInfo(int index) { wxString tableInfo; int nItems = GetN(index); const void *pItem = ToPointer(index); if (nItems == 0) tableInfo.Printf(wxT("%p"), pItem); else tableInfo.Printf(wxT("%p approx %u items)"), pItem, nItems); return tableInfo; } wxString wxLuaInterface::GetUserDataInfo(int index, bool full) { wxString userdatainfo; if (full) { wxString pTagName; int nTag = GetTag(index); if (nTag != TLUA_NOTAG) pTagName = lua2wx(GetLuaTagName(m_luaState, nTag)); if (pTagName != wxEmptyString) userdatainfo.Printf(wxT("%p (%s)"), ToUserData(index), pTagName.c_str()); else userdatainfo.Printf(wxT("%p (%u)"), ToUserData(index), nTag); } else userdatainfo.Printf(wxT("%p"), ToUserData(index)); return userdatainfo; } wxString wxLuaInterface::MakeNumber(double dnum) { wxString number; long num = (long) dnum; if ((double) num == dnum) { if (num >= 0) number.Printf(wxT("%lu (0x%lx)"), num, num); else number.Printf(wxT("%ld (0x%lx)"), num, num); } else number.Printf(wxT("%g"), dnum); return number; } wxString wxLuaInterface::MakeBoolean(int num) { if (num) return wxT("True"); return wxT("False"); } wxLuaDebugData *wxLuaInterface::GetGlobalData() { wxLuaDebugData *pSortedList = new wxLuaDebugData(); if (pSortedList != NULL) { GetGlobals(); int nRef = Ref(); pSortedList->Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0)); } return pSortedList; } Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 20 Nov 2005 22:28:07 -0000 1.2 --- Makefile 25 Nov 2005 19:45:36 -0000 1.3 *************** *** 51,60 **** HEADERS = \ ! ../include/debug.h \ ../include/splttree.h \ ../include/staktree.h SOURCES = \ ! debug.cpp \ splttree.cpp \ staktree.cpp --- 51,60 ---- HEADERS = \ ! ../include/wxldebug.h \ ../include/splttree.h \ ../include/staktree.h SOURCES = \ ! wxldebug.cpp \ splttree.cpp \ staktree.cpp --- debug.cpp DELETED --- |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:44
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: debug.h/cpp to wxldebug for completeness Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.vc 25 Nov 2005 19:22:57 -0000 1.12 --- makefile.vc 25 Nov 2005 19:45:36 -0000 1.13 *************** *** 210,214 **** $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj --- 210,214 ---- $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj *************** *** 221,225 **** /DA2DWXLUADEBUGMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj --- 221,225 ---- /DA2DWXLUADEBUGMAKINGDLL /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ msvc$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj *************** *** 801,805 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** --- 801,805 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** *************** *** 810,814 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** --- 810,814 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! msvc$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** makefile.bcc 25 Nov 2005 19:22:57 -0000 1.14 --- makefile.bcc 25 Nov 2005 19:45:36 -0000 1.15 *************** *** 233,237 **** $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj --- 233,237 ---- $(__WX_SHAREDDEFINE_p) -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj *************** *** 243,247 **** -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj --- 243,247 ---- -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj *************** *** 815,819 **** $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj: ..\..\wxluadebug\src\debug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** --- 815,819 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** *************** *** 824,828 **** $(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) $** --- 824,828 ---- $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.wat 25 Nov 2005 19:22:58 -0000 1.12 --- makefile.wat 25 Nov 2005 19:45:36 -0000 1.13 *************** *** 323,327 **** $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj --- 323,327 ---- $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj *************** *** 332,336 **** -dA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj --- 332,336 ---- -dA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj *************** *** 837,841 **** $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxluadebug_lib_debug.obj : .AUTODEPEND ..\..\wxluadebug\src\debug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< --- 837,841 ---- $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj : .AUTODEPEND ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< *************** *** 846,850 **** $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxluadebug_dll_debug.obj : .AUTODEPEND ..\..\wxluadebug\src\debug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $< --- 846,850 ---- $(CXX) -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.obj : .AUTODEPEND ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** makefile.gcc 25 Nov 2005 19:22:57 -0000 1.14 --- makefile.gcc 25 Nov 2005 19:45:36 -0000 1.15 *************** *** 205,209 **** $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o --- 205,209 ---- $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o *************** *** 215,219 **** -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_debug.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o --- 215,219 ---- -DA2DWXLUADEBUGMAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o *************** *** 755,759 **** $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_debug.o: ../../wxluadebug/src/debug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $(CPPDEPS) $< --- 755,759 ---- $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< ! mingw$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.o: ../../wxluadebug/src/wxldebug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 764,768 **** $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $(CPPDEPS) $< ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_debug.o: ../../wxluadebug/src/debug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(CPPDEPS) $< --- 764,768 ---- $(CXX) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $(CPPDEPS) $< ! mingw$(WXLIBPOSTFIX)\wxluadebug_dll_wxldebug.o: ../../wxluadebug/src/wxldebug.cpp $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(CPPDEPS) $< |
|
From: John L. <jr...@us...> - 2005-11-25 19:45:44
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27934/wxLua/docs Modified Files: dirs.txt Log Message: debug.h/cpp to wxldebug for completeness Index: dirs.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/dirs.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dirs.txt 20 Nov 2005 21:20:36 -0000 1.2 --- dirs.txt 25 Nov 2005 19:45:36 -0000 1.3 *************** *** 1,9 **** 11/20/2005 ! This is a description of the directory structure of wxLua. ! ------------------------------------------------------------------------------- Directory structure of wxLua ! ------------------------------------------------------------------------------- wxLua/ --- 1,9 ---- 11/20/2005 ! This is a description of the directory structure of wxLua. ! ------------------------------------------------------------------------------- Directory structure of wxLua ! ------------------------------------------------------------------------------- wxLua/ *************** *** 24,28 **** /docs/ - any generic docs go here /lib/ - output libs are built here, wxlualib for example ! /modules/ - c/c++ code for wxlua /build/ - build files for all of this --- 24,28 ---- /docs/ - any generic docs go here /lib/ - output libs are built here, wxlualib for example ! /modules/ - c/c++ code for wxlua /build/ - build files for all of this *************** *** 35,62 **** /src/ - internal.cpp, interp.cpp, library.cpp /wxluasocket/ - lua to cpp sockets (the original lua sockets) ! /include/ - debugio.h, dserver.h, socket.h /src/ - debugio.cpp, dserver.cpp, socket.cpp /wxluadebug/ - mechanism for getting/showing info from lua /include/ - debug.h, stacktree, splittree /src/ - debug.cpp, stacktree, splittree ! /wxxmlrpc/ - TODO - ? ! /include/ - ! /src/ - /wxdebuggernub/ - TODO - this is a generic lib for xmlrpc? don"t prepend wxlua to it ! /include/ - ! /src/ - /wxluadebugger/ - TODO - ? this depends on wxlua so prepend wxlua to it ! /include/ - ! /src/ - ! /samples/ - sample wxlua programs /name/ - TODO - any multifile sample gets its own dir /utils/ - generic utils /bin2c/ - a program to convert a text file to an unsigned char array ! ------------------------------------------------------------------------------ DEAD UNUSED DIRECTORIES (to be removed by Sourceforge) ! ------------------------------------------------------------------------------ wxLua/ --- 35,62 ---- /src/ - internal.cpp, interp.cpp, library.cpp /wxluasocket/ - lua to cpp sockets (the original lua sockets) ! /include/ - debugio.h, dserver.h, socket.h /src/ - debugio.cpp, dserver.cpp, socket.cpp /wxluadebug/ - mechanism for getting/showing info from lua /include/ - debug.h, stacktree, splittree /src/ - debug.cpp, stacktree, splittree ! /wxxmlrpc/ - TODO - ? ! /include/ - ! /src/ - /wxdebuggernub/ - TODO - this is a generic lib for xmlrpc? don"t prepend wxlua to it ! /include/ - ! /src/ - /wxluadebugger/ - TODO - ? this depends on wxlua so prepend wxlua to it ! /include/ - ! /src/ - ! /samples/ - sample wxlua programs /name/ - TODO - any multifile sample gets its own dir /utils/ - generic utils /bin2c/ - a program to convert a text file to an unsigned char array ! ------------------------------------------------------------------------------ DEAD UNUSED DIRECTORIES (to be removed by Sourceforge) ! ------------------------------------------------------------------------------ wxLua/ *************** *** 68,74 **** /wxlua/ - see /modules/wxlua ! ------------------------------------------------------------------------------ Original wxLua distribution directory structure ! ------------------------------------------------------------------------------- wxLua/ --- 68,74 ---- /wxlua/ - see /modules/wxlua ! ------------------------------------------------------------------------------ Original wxLua distribution directory structure ! ------------------------------------------------------------------------------- wxLua/ *************** *** 79,118 **** Standalone/ - moved to apps/wxlua ! ------------------------------------------------------------------------------- File name mapping from the original wxLua ! ------------------------------------------------------------------------------- These header files were in wxLua/Library ! wxlua.h wxLua.h ! callback.h wxLuaCallback.h ! debug.h wxLuaDebug.h ! debugio.h wxLuaDebugIO.h ! dserver.h wxLuaDebugServer.h ! dservice.h wxLuaDebuggerService.h ! htmlwin.h wxLuaHtmlWindow.h ! internal.h wxLuaInternals.h ! interp.h wxLuaInterpreter.h ! library.h wxLuaLibrary.h ! printing.h wxLuaPrinting.h ! socket.h wxLuaSocket.h ! splttree.h wxLuaSplitTree.h ! staktree.h wxLuaStackTree.h These source files were in wxLua/Library ! debug.cpp wxLuaDebug.cpp ! debugio.cpp wxLuaDebugIO.cpp ! dserver.cpp wxLuaDebugServer.cpp ! dservice.cpp wxLuaDebuggerService.cpp ! htmlwin.cpp wxLuaHtmlWindow.cpp ! internal.cpp wxLuaInternals.cpp ! interp.cpp wxLuaInterpreter.cpp ! library.cpp wxLuaLibrary.cpp ! printing.cpp wxLuaPrinting.cpp ! socket.cpp wxLuaSocket.cpp ! splttree.cpp wxLuaSplitTree.cpp ! staktree.cpp wxLuaStackTree.cpp ! dtarget.h wxLuaDebugTarget.h moved from wxLua/Standalone ! dtarget.cpp wxLuaDebugTarget.cpp moved from wxLua/Standalone --- 79,134 ---- Standalone/ - moved to apps/wxlua ! ------------------------------------------------------------------------------- File name mapping from the original wxLua ! ------------------------------------------------------------------------------- + ------------------------------------------------------------------------------- These header files were in wxLua/Library ! wxLua/modules/wxlua ! internal.h wxLuaInternals.h ! wxlcallb.h wxLuaCallback.h ! wxlintrp.h wxLuaInterpreter.h ! wxlua.h wxLua.h ! ! wxLua/modules/wxluadebug ! debug.h wxLuaDebug.h ! splttree.h wxLuaSplitTree.h ! staktree.h wxLuaStackTree.h ! ! wxLua/modules/wxluasocket ! dservice.h wxLuaDebuggerService.h ! wxldbgio.h wxLuaDebugIO.h ! wxldserv.h wxLuaDebugServer.h ! wxlhandl.h wxLuaLibrary.h ! wxlsock.h wxLuaSocket.h ! wxldtarg.h wxLuaDebugTarget.h moved from wxLua/Standalone + wxLua/modules/wxbind + wxlhtmlwin.h wxLuaHtmlWindow.h + wxlprinting.h wxLuaPrinting.h + + ------------------------------------------------------------------------------- These source files were in wxLua/Library ! wxLua/modules/wxlua ! internal.cpp wxLuaInternals.cpp ! wxlintrp.cpp wxLuaInterpreter.cpp ! wxlcallb.cpp taken out of wxLuaInternals.cpp ! wxLua/modules/wxluadebug ! debug.cpp wxLuaDebug.cpp ! splttree.cpp wxLuaSplitTree.cpp ! staktree.cpp wxLuaStackTree.cpp ! ! wxLua/modules/wxluasocket ! dservice.cpp wxLuaDebuggerService.cpp ! wxldbgio.cpp wxLuaDebugIO.cpp ! wxldserv.cpp wxLuaDebugServer.cpp ! wxlhandl.cpp wxLuaLibrary.cpp ! wxlsock.cpp wxLuaSocket.cpp ! wxldtarg.cpp wxLuaDebugTarget.cpp moved from wxLua/Standalone ! ! wxLua/modules/wxbind ! wxlhtmlwin.cpp wxLuaHtmlWindow.cpp ! wxlprinting.cpp wxLuaPrinting.cpp |
|
From: John L. <jr...@us...> - 2005-11-25 19:23:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333/wxLua/modules/wxlua/src Modified Files: internal.cpp Log Message: rename wxluasocket files to wxl* for consistency and make it easier to find them Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** internal.cpp 25 Nov 2005 19:03:28 -0000 1.9 --- internal.cpp 25 Nov 2005 19:22:58 -0000 1.10 *************** *** 37,40 **** --- 37,41 ---- #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" + #include "wxlua/include/wxlintrp.h" #include "wxbind/include/wxbind.h" *************** *** 56,60 **** //#endif - #include "wxlua/include/wxlintrp.h" extern int wxLuaEventListCompareFn(const void *p1, const void *p2); // in wxlbind.cpp --- 57,60 ---- |
|
From: John L. <jr...@us...> - 2005-11-25 19:23:12
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333/wxLua/modules Modified Files: Makefile.in Log Message: rename wxluasocket files to wxl* for consistency and make it easier to find them Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.in 25 Nov 2005 19:03:28 -0000 1.11 --- Makefile.in 25 Nov 2005 19:22:57 -0000 1.12 *************** *** 178,194 **** $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ ! wxluasocket_lib_debugio.o \ ! wxluasocket_lib_dserver.o \ ! wxluasocket_lib_dtarget.o \ ! wxluasocket_lib_socket.o \ ! wxluasocket_lib_wxlhandl.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 \ ! wxluasocket_dll_wxlhandl.o ### Conditionally set variables: ### --- 178,194 ---- $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ ! wxluasocket_lib_wxldbgio.o \ ! wxluasocket_lib_wxldserv.o \ ! wxluasocket_lib_wxldtarg.o \ ! wxluasocket_lib_wxlhandl.o \ ! wxluasocket_lib_wxlsock.o WXLUASOCKET_DLL_CXXFLAGS = -I./../modules -DA2DWXLUASOCKETMAKINGDLL \ $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ ! wxluasocket_dll_wxldbgio.o \ ! wxluasocket_dll_wxldserv.o \ ! wxluasocket_dll_wxldtarg.o \ ! wxluasocket_dll_wxlhandl.o \ ! wxluasocket_dll_wxlsock.o ### Conditionally set variables: ### *************** *** 732,765 **** $(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_lib_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxlhandl.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 wxluasocket_dll_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxlhandl.cpp # Include dependency info, if present: --- 732,765 ---- $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) ./wxluadebug/src/staktree.cpp ! wxluasocket_lib_wxldbgio.o: ./wxluasocket/src/wxldbgio.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxldbgio.cpp ! wxluasocket_lib_wxldserv.o: ./wxluasocket/src/wxldserv.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxldserv.cpp ! wxluasocket_lib_wxldtarg.o: ./wxluasocket/src/wxldtarg.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxldtarg.cpp wxluasocket_lib_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxlhandl.cpp ! wxluasocket_lib_wxlsock.o: ./wxluasocket/src/wxlsock.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) ./wxluasocket/src/wxlsock.cpp ! wxluasocket_dll_wxldbgio.o: ./wxluasocket/src/wxldbgio.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxldbgio.cpp ! wxluasocket_dll_wxldserv.o: ./wxluasocket/src/wxldserv.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxldserv.cpp ! wxluasocket_dll_wxldtarg.o: ./wxluasocket/src/wxldtarg.cpp ! $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxldtarg.cpp wxluasocket_dll_wxlhandl.o: ./wxluasocket/src/wxlhandl.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxlhandl.cpp + wxluasocket_dll_wxlsock.o: ./wxluasocket/src/wxlsock.cpp + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) ./wxluasocket/src/wxlsock.cpp + # Include dependency info, if present: |
|
From: John L. <jr...@us...> - 2005-11-25 19:23:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333/wxLua/bindings/wxwidgets Modified Files: wxlua.i Log Message: rename wxluasocket files to wxl* for consistency and make it easier to find them Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlua.i 25 Nov 2005 02:43:01 -0000 1.5 --- wxlua.i 25 Nov 2005 19:22:57 -0000 1.6 *************** *** 34,38 **** %if wxLUA_USE_wxLuaDebugServer ! %include "wxluasocket/include/dserver.h" %class %delete %noclassinfo wxLuaDebugServer --- 34,38 ---- %if wxLUA_USE_wxLuaDebugServer ! %include "wxluasocket/include/wxldserv.h" %class %delete %noclassinfo wxLuaDebugServer |
|
From: John L. <jr...@us...> - 2005-11-25 19:23:12
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333/wxLua/modules/build/bakefiles Modified Files: sources.bkl Log Message: rename wxluasocket files to wxl* for consistency and make it easier to find them Index: sources.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sources.bkl 25 Nov 2005 19:03:28 -0000 1.9 --- sources.bkl 25 Nov 2005 19:22:57 -0000 1.10 *************** *** 163,179 **** <!-- ================================================================== --> <set var="wxluasocket_src"> ! wxluasocket/src/debugio.cpp ! wxluasocket/src/dserver.cpp ! wxluasocket/src/dtarget.cpp ! wxluasocket/src/socket.cpp wxluasocket/src/wxlhandl.cpp </set> <set var="wxluasocket_hdr"> ! wxluasocket/include/debugio.h ! wxluasocket/include/dserver.h ! wxluasocket/include/dtarget.h ! wxluasocket/include/socket.h wxluasocket/include/wxlhandl.h </set> --- 163,179 ---- <!-- ================================================================== --> <set var="wxluasocket_src"> ! wxluasocket/src/wxldbgio.cpp ! wxluasocket/src/wxldserv.cpp ! wxluasocket/src/wxldtarg.cpp wxluasocket/src/wxlhandl.cpp + wxluasocket/src/wxlsock.cpp </set> <set var="wxluasocket_hdr"> ! wxluasocket/include/wxldbgio.h ! wxluasocket/include/wxldserv.h ! wxluasocket/include/wxldtarg.h wxluasocket/include/wxlhandl.h + wxluasocket/include/wxlsock.h </set> |
|
From: John L. <jr...@us...> - 2005-11-25 19:23:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23333/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: rename wxluasocket files to wxl* for consistency and make it easier to find them Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** staktree.cpp 25 Nov 2005 18:52:22 -0000 1.5 --- staktree.cpp 25 Nov 2005 19:22:58 -0000 1.6 *************** *** 31,36 **** #include "wxlua/include/wxlua.h" ! #include "wxluasocket/include/debugio.h" ! #include "wxluasocket/include/dserver.h" #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) --- 31,36 ---- #include "wxlua/include/wxlua.h" ! #include "wxluasocket/include/wxldbgio.h" ! #include "wxluasocket/include/wxldserv.h" #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) |
