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: Francesco M. <fr...@us...> - 2006-05-14 12:56:00
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_lua_lib.dsp Log Message: added LUA checks to configure script Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.vc 29 Mar 2006 18:41:42 -0000 1.41 --- makefile.vc 14 May 2006 12:55:56 -0000 1.42 *************** *** 77,81 **** $(____BUILD_32) $(____BUILD_33) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.pdb \ ! /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 77,81 ---- $(____BUILD_32) $(____BUILD_33) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.pdb \ ! /DWXLUA_LUA_NEWTHREAD /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 577,581 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! link /NOLOGO /OUT:$@ $(LDFLAGS) $(____BUILD_1_1) @<< $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib << --- 577,581 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! link /NOLOGO /OUT:$@ $(LDFLAGS) $(____BUILD_1_1) @<< $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib << Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** modules_mod_lua_lib.dsp 29 Mar 2006 18:41:42 -0000 1.18 --- modules_mod_lua_lib.dsp 14 May 2006 12:55:56 -0000 1.19 *************** *** 55,60 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 55,60 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 78,83 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 78,83 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 101,106 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 101,106 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 124,129 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 124,129 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 147,152 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 147,152 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 170,175 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 170,175 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 193,198 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 193,198 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 216,221 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 216,221 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 239,244 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 239,244 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 262,267 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 262,267 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 285,290 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 285,290 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 308,313 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 308,313 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 331,336 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 331,336 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 354,359 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 354,359 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 377,382 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 377,382 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 400,405 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 400,405 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.bcc 29 Mar 2006 18:41:41 -0000 1.42 --- makefile.bcc 14 May 2006 12:55:56 -0000 1.43 *************** *** 109,113 **** MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____SHARED) $(____BUILD) \ ! $(____BUILD_9) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 109,114 ---- MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____SHARED) $(____BUILD) \ ! $(____BUILD_9) -DWXLUA_LUA_NEWTHREAD -I..\..\lua\include $(CPPFLAGS) \ ! $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 574,578 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____BUILD_9) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | --- 575,579 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____BUILD_9) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.wat 29 Mar 2006 18:41:42 -0000 1.41 --- makefile.wat 14 May 2006 12:55:56 -0000 1.42 *************** *** 492,496 **** MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_21) $(____BUILD_22) & ! -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & --- 492,496 ---- MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_21) $(____BUILD_22) & ! -dWXLUA_LUA_NEWTHREAD -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.gcc 29 Mar 2006 18:41:42 -0000 1.42 --- makefile.gcc 14 May 2006 12:55:56 -0000 1.43 *************** *** 69,73 **** CPPDEPS = -MT$@ -MF$@.d -MD MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_18) $(____BUILD_20) \ ! -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ --- 69,73 ---- CPPDEPS = -MT$@ -MF$@.d -MD MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_18) $(____BUILD_20) \ ! -DWXLUA_LUA_NEWTHREAD -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ *************** *** 668,672 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ! $(CC) -o $@ $(MOD_LUA_OBJECTS) $(LDFLAGS) $(____BUILD_20) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ifeq ($(SHARED),0) --- 668,672 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ! $(CC) -o $@ $(MOD_LUA_OBJECTS) $(LDFLAGS) $(____BUILD_20) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ifeq ($(SHARED),0) |
|
From: Francesco M. <fr...@us...> - 2006-05-14 12:56:00
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: added LUA checks to configure script Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** options.bkl 6 Mar 2006 19:31:45 -0000 1.10 --- options.bkl 14 May 2006 12:55:56 -0000 1.11 *************** *** 71,73 **** --- 71,89 ---- </if> + + + <!-- lua module specific flags --> + <!-- ========================= --> + + <if cond="FORMAT=='autoconf'"> + <!-- right values for these are detected by the configure script --> + <option name="LUA_PLATFORM_SPECIFIC_CFLAGS"/> + <option name="LUA_PLATFORM_SPECIFIC_LDFLAGS"/> + </if> + + <if cond="FORMAT!='autoconf'"> + <set var="LUA_PLATFORM_SPECIFIC_CFLAGS"/> + <set var="LUA_PLATFORM_SPECIFIC_LDFLAGS"/> + </if> + </makefile> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** modules.bkl 13 May 2006 21:05:36 -0000 1.29 --- modules.bkl 14 May 2006 12:55:56 -0000 1.30 *************** *** 50,53 **** --- 50,58 ---- <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_LUA_NEWTHREAD</define> + + <!-- see options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + <sources>$(LUALIB_SRC)</sources> <headers>$(LUALIB_HDR)</headers> *************** *** 67,70 **** --- 72,79 ---- <sources>$(LUA_SRC)</sources> + <!-- see options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + <include>$(WXLUA_SOURCEDIR)/lua/include</include> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> |
|
From: Francesco M. <fr...@us...> - 2006-05-14 12:55:59
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721/build/autoconf Modified Files: aclocal.m4 configure.ac wxpresets.m4 Log Message: added LUA checks to configure script Index: wxpresets.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxpresets.m4,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxpresets.m4 18 Mar 2006 19:18:16 -0000 1.16 --- wxpresets.m4 14 May 2006 12:55:56 -0000 1.17 *************** *** 95,98 **** --- 95,122 ---- ]) + # same as AM_BOOLOPT_SUMMARY but takes 2 bool options + AC_DEFUN([AM_2BOOLOPT_SUMMARY], + [ + if [[ "x$$1" = "x1" -a "x$$2" = "x1" ]]; then + echo $3 + elif [[ "x$$1" = "x0" -o "x$$2" = "x0" ]]; then + echo $4 + else + echo "$1 is $$1; $2 is $$2" + fi + ]) + + # same as AM_BOOLOPT_SUMMARY but takes 3 bool options + AC_DEFUN([AM_3BOOLOPT_SUMMARY], + [ + if [[ "x$$1" = "x1" -a "x$$2" = "x1" -a "x$$3" = "x1" ]]; then + echo $4 + elif [[ "x$$1" = "x0" -o "x$$2" = "x0" -o "x$$3" = "x0" ]]; then + echo $5 + else + echo "$1 is $$1; $2 is $$2; $3 is $$3" + fi + ]) + dnl --------------------------------------------------------------------------- Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure.ac 12 Apr 2006 18:04:05 -0000 1.26 --- configure.ac 14 May 2006 12:55:56 -0000 1.27 *************** *** 89,92 **** --- 89,121 ---- ##################################################################### + # Checks used to determine right LUA flags (see modules/lua/src/Makefile) + luadefs= + lualibs= + + # these do not require additional libs + AC_CHECK_FUNC([isatty], [luadefs="$luadefs -DLUA_USE_ISATTY"]) + AC_CHECK_FUNC([mkstemp], [luadefs="$luadefs -DLUA_USE_MKSTEMP"]) + AC_CHECK_FUNC([popen], [luadefs="$luadefs -DLUA_USE_POPEN"]) + AC_CHECK_FUNC([_longjmp], [luadefs="$luadefs -DLUA_USE_ULONGJMP"]) + + # these require addlibs + AC_CHECK_LIB([dl], [dlopen], [ + AC_CHECK_HEADER([dlfcn.h], [ + luadefs="$luadefs -DLUA_USE_DLOPEN" + lualibs="$lualibs -ldl" + ]) + ]) + AC_CHECK_LIB([readline], [readline], [ + luadefs="$luadefs -DLUA_USE_READLINE" + lualibs="$lualibs -lreadline" + ]) + + LUA_PLATFORM_SPECIFIC_CFLAGS=$luadefs + LUA_PLATFORM_SPECIFIC_LDFLAGS=$lualibs + AC_SUBST(LUA_PLATFORM_SPECIFIC_CFLAGS) + AC_SUBST(LUA_PLATFORM_SPECIFIC_LDFLAGS) + + + # check for wxWidgets WXLIBS_REQUIRED="xrc,html,adv,net,xml" *************** *** 95,98 **** --- 124,128 ---- + dnl --------------------------------------------------------------------------- dnl AM_WXSTC_CHECK( *************** *** 171,175 **** or report this problem to $PACKAGE_BUGREPORT. NOTE: build is proceeding without Scintilla wrappers, but you will miss ! the wxLuaApp and wxLuaEdit applications). ]) USE_WXBINDSTC=0 --- 201,205 ---- or report this problem to $PACKAGE_BUGREPORT. NOTE: build is proceeding without Scintilla wrappers, but you will miss ! the wxLuaApp and wxLuaEdit applications! ]) USE_WXBINDSTC=0 *************** *** 254,264 **** AC_OUTPUT AM_WXPRESETS_MSG_BEGIN # applications ! AM_BOOLOPT_SUMMARY([USE_WXLUAAPP], [" - wxLua application: yes"], [" - wxLua application: no"]) ! AM_BOOLOPT_SUMMARY([USE_WXLUACANAPP], [" - wxLuaCan application: yes"], [" - wxLuaCan application: no"]) --- 284,301 ---- AC_OUTPUT + + # output a nice summary of detected options + # NOTE: keep build conditions in synch with bakefiles; e.g. app_wxlua is + # declared as: + # <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> + # and thus the AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], ...) macro must be used ! + AM_WXPRESETS_MSG_BEGIN # applications ! AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], [" - wxLua application: yes"], [" - wxLua application: no"]) ! AM_2BOOLOPT_SUMMARY([USE_WXLUACANAPP], [USE_WXBINDSTC], [" - wxLuaCan application: yes"], [" - wxLuaCan application: no"]) |
|
From: Francesco M. <fr...@us...> - 2006-05-14 12:55:59
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721/modules Modified Files: Makefile.in Log Message: added LUA checks to configure script Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Makefile.in 5 Apr 2006 13:27:32 -0000 1.35 --- Makefile.in 14 May 2006 12:55:56 -0000 1.36 *************** *** 45,53 **** WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ ### Variables: ### DESTDIR = ! MOD_LUA_LIB_CFLAGS = -I$(top_srcdir)/modules/lua/include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mod_lua_lib_lapi.o \ --- 45,57 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ + LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ + LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ ### Variables: ### DESTDIR = ! MOD_LUA_LIB_CFLAGS = -DWXLUA_LUA_NEWTHREAD \ ! -I$(top_srcdir)/modules/lua/include $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mod_lua_lib_lapi.o \ *************** *** 80,84 **** mod_lua_lib_loadlib.o \ mod_lua_lib_linit.o ! MOD_LUA_CFLAGS = -I$(top_srcdir)/modules/lua/include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ mod_lua_lua.o --- 84,89 ---- mod_lua_lib_loadlib.o \ mod_lua_lib_linit.o ! MOD_LUA_CFLAGS = -I$(top_srcdir)/modules/lua/include \ ! $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ mod_lua_lua.o *************** *** 601,605 **** $(top_builddir)bin/wxlua-lua$(EXEEXT): $(MOD_LUA_OBJECTS) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L$(top_builddir)lib $(LDFLAGS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lm $(__mod_lua___mac_setfilecmd) --- 606,610 ---- $(top_builddir)bin/wxlua-lua$(EXEEXT): $(MOD_LUA_OBJECTS) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L$(top_builddir)lib $(LDFLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lm $(__mod_lua___mac_setfilecmd) |
|
From: John L. <jr...@us...> - 2006-05-14 07:48:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1343/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: Add classinfo to the encapsulated classes for showing what they are in stacktree show the tracked class types in the stack tree use long for memory pointers not int in AddToTrackedMemory Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** wxlstate.cpp 14 May 2006 00:40:56 -0000 1.67 --- wxlstate.cpp 14 May 2006 07:48:09 -0000 1.68 *************** *** 1526,1530 **** } ! void wxLuaState::AddToTrackedMemoryList(int obj_ptr, wxObject *pObject) { wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track")); --- 1526,1530 ---- } ! void wxLuaState::AddToTrackedMemoryList(long obj_ptr, wxObject *pObject) { wxCHECK_RET(Ok() && pObject, wxT("Invalid wxLuaState or wxObject to track")); *************** *** 1539,1549 **** if (it != M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.end()) { ! // remove the item from being tracked ! M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.erase(it); ! wxObject *pDeleteObject = (wxObject*)it->second; if (fDelete && (pDeleteObject != NULL)) delete pDeleteObject; return true; } --- 1539,1552 ---- if (it != M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.end()) { ! // always delete the object for the case where it's encapsulated wxObject *pDeleteObject = (wxObject*)it->second; if (fDelete && (pDeleteObject != NULL)) delete pDeleteObject; + it->second = 0; + + // remove the item from being tracked + M_WXLSTATEDATA->m_wxlStateData->m_pTrackedList.erase(it); + return true; } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlbind.cpp 4 May 2006 02:47:34 -0000 1.32 --- wxlbind.cpp 14 May 2006 07:48:09 -0000 1.33 *************** *** 71,78 **** { wxLuaStringToLongHashMap *pHashTable = (wxLuaStringToLongHashMap *)it->second; - wxlState.GetLuaStateData()->m_pDerivedList.erase(it); - if (pHashTable != NULL) delete pHashTable; } --- 71,80 ---- { wxLuaStringToLongHashMap *pHashTable = (wxLuaStringToLongHashMap *)it->second; if (pHashTable != NULL) delete pHashTable; + + it->second = 0; + + wxlState.GetLuaStateData()->m_pDerivedList.erase(it); } *************** *** 400,404 **** // install the classes, functions and methods for (iClass = 0; iClass < m_classCount; ++iClass, ! iTag = registerTypes ? wxlState.tnewtag() : iTag + 1) { WXLUACLASS *pClass = m_classList + iClass; --- 402,406 ---- // install the classes, functions and methods for (iClass = 0; iClass < m_classCount; ++iClass, ! iTag = (registerTypes ? wxlState.tnewtag() : iTag + 1)) { WXLUACLASS *pClass = m_classList + iClass; |
|
From: John L. <jr...@us...> - 2006-05-14 07:48:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1343/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h Log Message: Add classinfo to the encapsulated classes for showing what they are in stacktree show the tracked class types in the stack tree use long for memory pointers not int in AddToTrackedMemory Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlbind.h 18 Apr 2006 19:56:55 -0000 1.15 --- wxlbind.h 14 May 2006 07:48:09 -0000 1.16 *************** *** 164,170 **** --- 164,172 ---- private: \ theObject *m_p##theObject; \ + DECLARE_ABSTRACT_CLASS(wxObject_##theObject); \ }; #define wxLUA_IMPLEMENT_ENCAPSULATION(theObject) \ + IMPLEMENT_ABSTRACT_CLASS(wxObject_##theObject, wxObject); \ wxObject_##theObject::wxObject_##theObject(theObject *p##theObject) \ :m_p##theObject(p##theObject) \ Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxlstate.h 14 May 2006 00:40:56 -0000 1.46 --- wxlstate.h 14 May 2006 07:48:09 -0000 1.47 *************** *** 406,410 **** void AddToTrackedMemoryList(wxObject *pObject); ! void AddToTrackedMemoryList(int obj_ptr, wxObject *pObject); bool RemoveTrackedMemory(void *pObject, bool fDelete = true); --- 406,410 ---- void AddToTrackedMemoryList(wxObject *pObject); ! void AddToTrackedMemoryList(long obj_ptr, wxObject *pObject); bool RemoveTrackedMemory(void *pObject, bool fDelete = true); |
|
From: John L. <jr...@us...> - 2006-05-14 07:48:13
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1343/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: Add classinfo to the encapsulated classes for showing what they are in stacktree show the tracked class types in the stack tree use long for memory pointers not int in AddToTrackedMemory Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxluasudoku.wx.lua 13 May 2006 17:20:52 -0000 1.45 --- wxluasudoku.wx.lua 14 May 2006 07:48:09 -0000 1.46 *************** *** 1851,1854 **** --- 1851,1857 ---- sudokuSolnTable = nil, -- solution to the current puzzle + possNakedTable = nil, + possHiddenTable = nil, + pencilMarks = {}, -- pencilMarks[cell][value] = true/nil pencilMarksNakedTable = nil, *************** *** 2034,2043 **** -- clear the window before drawing dc:SetPen(wx.wxTRANSPARENT_PEN) ! local bgColour = sudokuGUI.Colours[sudokuGUI.FOCUS_CELL_COLOUR] if sudokuGUI.focused_cell_id ~= cell then ! bgColour = sudokuGUI.cellWindows[cell]:GetBackgroundColour() end ! dc:SetBrush(wx.wxBrush(bgColour, wx.wxSOLID)) dc:DrawRectangle(0, 0, width, height) local sudokuTable = sudokuGUI.GetCurrentGrid() --- 2037,2054 ---- -- clear the window before drawing dc:SetPen(wx.wxTRANSPARENT_PEN) ! local bgColour if sudokuGUI.focused_cell_id ~= cell then ! if math.fmod(sudoku.CellToBlock(cell), 2) ~= 0 then ! bgColour = sudokuGUI.Colours[sudokuGUI.BACKGROUND_COLOUR] ! else ! bgColour = sudokuGUI.Colours[sudokuGUI.ODD_BACKGROUND_COLOUR] ! end ! else ! bgColour = sudokuGUI.Colours[sudokuGUI.FOCUS_CELL_COLOUR] end ! local brush = wx.wxBrush(bgColour, wx.wxSOLID) ! dc:SetBrush(brush) dc:DrawRectangle(0, 0, width, height) + brush:Delete() local sudokuTable = sudokuGUI.GetCurrentGrid() *************** *** 2081,2086 **** end ! local naked = sudokuTable.nakedTable ! local hidden = sudokuTable.hiddenTable if show_possible_user then naked = sudokuGUI.pencilMarksNakedTable --- 2092,2097 ---- end ! local naked = sudokuGUI.possNakedTable ! local hidden = sudokuGUI.possHiddenTable if show_possible_user then naked = sudokuGUI.pencilMarksNakedTable *************** *** 2107,2128 **** -- draw pair marker last so it's on top of the others if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENQUADS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_QUADS_COLOUR], 1, wx.wxSOLID), 4, hidden.quads.cells[cell]) end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDQUADS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_QUADS_COLOUR], 1, wx.wxSOLID), 4, naked.quads.cells[cell]) end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENTRIPLETS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_TRIPLETS_COLOUR], 1, wx.wxSOLID), 3, hidden.triplets.cells[cell]) end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDTRIPLETS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_TRIPLETS_COLOUR], 1, wx.wxSOLID), 3, naked.triplets.cells[cell]) end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENPAIRS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_PAIRS_COLOUR], 1, wx.wxSOLID), 2, hidden.pairs.cells[cell]) end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDPAIRS) then ! draw_nakedhidden(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_PAIRS_COLOUR], 1, wx.wxSOLID), 2, naked.pairs.cells[cell]) end end --- 2118,2151 ---- -- draw pair marker last so it's on top of the others if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENQUADS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_QUADS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 4, hidden.quads.cells[cell]) ! pen:Delete() end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDQUADS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_QUADS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 4, naked.quads.cells[cell]) ! pen:Delete() end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENTRIPLETS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_TRIPLETS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 3, hidden.triplets.cells[cell]) ! pen:Delete() end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDTRIPLETS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_TRIPLETS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 3, naked.triplets.cells[cell]) ! pen:Delete() end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_HIDDENPAIRS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.HIDDEN_PAIRS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 2, hidden.pairs.cells[cell]) ! pen:Delete() end if sudokuGUI.IsCheckedMenuItem(sudokuGUI.ID_SHOW_NAKEDPAIRS) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.NAKED_PAIRS_COLOUR], 1, wx.wxSOLID) ! draw_nakedhidden(pen, 2, naked.pairs.cells[cell]) ! pen:Delete() end end *************** *** 2144,2148 **** (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! dc:SetPen(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) end --- 2167,2173 ---- (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID) ! dc:SetPen(pen) ! pen:Delete() dc:DrawLine(0, 0, width, height) end *************** *** 2151,2160 **** -- Draw the set value, if any if string.len(value_str) then if is_init then ! dc:SetTextForeground(sudokuGUI.Colours[sudokuGUI.INIT_VALUE_COLOUR]) else ! dc:SetTextForeground(sudokuGUI.Colours[sudokuGUI.VALUE_COLOUR]) end dc:SetFont(valueFont.wxfont) dc:DrawText(value_str, width/2 - valueFont.width/2, --- 2176,2188 ---- -- Draw the set value, if any if string.len(value_str) then + local fgColour if is_init then ! fgColour = sudokuGUI.Colours[sudokuGUI.INIT_VALUE_COLOUR] else ! fgColour = sudokuGUI.Colours[sudokuGUI.VALUE_COLOUR] end + dc:SetTextForeground(fgColour) + dc:SetFont(valueFont.wxfont) dc:DrawText(value_str, width/2 - valueFont.width/2, *************** *** 2299,2303 **** local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! dc:SetPen(wx.wxPenFromColour(wx.wxColour(0, 0, 0), iff(borders[i], 4, 2), wx.wxSOLID)) dc:DrawLine(ColOrigin(1), RowOrigin(i), ColOrigin(10), RowOrigin(i)) dc:DrawLine(ColOrigin(i), RowOrigin(1), ColOrigin(i), RowOrigin(10)) --- 2327,2333 ---- local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! local pen = wx.wxPenFromColour(wx.BLACK, iff(borders[i], 4, 2), wx,SOLID) ! dc:SetPen(pen) ! pen:Delete() dc:DrawLine(ColOrigin(1), RowOrigin(i), ColOrigin(10), RowOrigin(i)) dc:DrawLine(ColOrigin(i), RowOrigin(1), ColOrigin(i), RowOrigin(10)) *************** *** 2668,2671 **** --- 2698,2712 ---- table.remove(sudokuGUI.sudokuTables) end + + -- clear calculated values to save memory + for n = 2, sudokuGUI.sudokuTables_pos do + sudokuGUI.sudokuTables[n].possible = {} + sudokuGUI.sudokuTables[n].row_values = {} + sudokuGUI.sudokuTables[n].col_values = {} + sudokuGUI.sudokuTables[n].block_values = {} + sudokuGUI.sudokuTables[n].possible = {} + sudokuGUI.sudokuTables[n].invalid = {} + end + table.insert(sudokuGUI.sudokuTables, sudokuTable) sudokuGUI.sudokuTables_pos = sudokuGUI.sudokuTables_pos + 1 *************** *** 2945,2952 **** end - function sudokuGUI.SolveInitPuzzle() - - end - function sudokuGUI.FixInvalid(sudokuTable, show_dialog) local s = TableCopy(sudokuTable) --- 2986,2989 ---- *************** *** 3119,3125 **** local s, count, changed_cells = sudoku.SolveScan(s) - s.nakedTable = nil -- slows things down - s.hiddenTable = nil - local s, g = sudoku.SolveBruteForce(s) --- 3156,3159 ---- *************** *** 3187,3191 **** sudokuTable.possible = p else ! sudokuTable.nakedTable, sudokuTable.hiddenTable = sudoku.FindAllNakedHiddenGroups(true, sudokuTable) end end --- 3221,3225 ---- sudokuTable.possible = p else ! sudokuGUI.possNakedTable, sudokuGUI.possHiddenTable = sudoku.FindAllNakedHiddenGroups(true, sudokuTable) end end *************** *** 3310,3314 **** c = listBoxValues[sel].colour end ! dc:SetBrush(wx.wxBrush(c, wx.wxSOLID)) dc:DrawRectangle(0, 0, width, height) --- 3344,3350 ---- c = listBoxValues[sel].colour end ! local brush = wx.wxBrush(c, wx.wxSOLID) ! dc:SetBrush(brush) ! brush:Delete() dc:DrawRectangle(0, 0, width, height) *************** *** 3338,3356 **** dc:SetBrush(wx.wxTRANSPARENT_BRUSH) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_PAIRS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[1].x, pos[1].y, font_width, font_height) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_TRIPLETS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[4].x, pos[4].y, font_width, font_height) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_QUADS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[7].x, pos[7].y, font_width, font_height) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_PAIRS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[3].x, pos[3].y, font_width, font_height) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_TRIPLETS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[6].x, pos[6].y, font_width, font_height) ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_QUADS_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawRectangle(pos[9].x, pos[9].y, font_width, font_height) -- draw invalid marker ! dc:SetPen(wx.wxPenFromColour(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) --- 3374,3400 ---- dc:SetBrush(wx.wxTRANSPARENT_BRUSH) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_PAIRS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[1].x, pos[1].y, font_width, font_height) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_TRIPLETS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[4].x, pos[4].y, font_width, font_height) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.NAKED_QUADS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[7].x, pos[7].y, font_width, font_height) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_PAIRS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[3].x, pos[3].y, font_width, font_height) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_TRIPLETS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[6].x, pos[6].y, font_width, font_height) ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.HIDDEN_QUADS_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen); pen:Delete() dc:DrawRectangle(pos[9].x, pos[9].y, font_width, font_height) -- draw invalid marker ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID) ! dc:SetPen(pen) ! pen:Delete() dc:DrawLine(0, 0, width, height) *************** *** 3387,3392 **** --- 3431,3439 ---- f = wx.wxGetFontFromUser(panel, f) if f:Ok() then + listBoxValues[sel].font:Delete() listBoxValues[sel].font = f reset_fonts = true + else + f:Delete() end sampleWin:Refresh(false) *************** *** 3398,3403 **** --- 3445,3453 ---- c = wx.wxGetColourFromUser(panel, c) if c:Ok() then + listBoxValues[sel].colour:Delete() listBoxValues[sel].colour = c colourButton:SetForegroundColour(c) + else + c:Delete() end sampleWin:Refresh(false) *************** *** 3415,3429 **** --- 3465,3485 ---- if ret == wx.wxYES then for n = 1, sudokuGUI.COLOUR_MAX do + listBoxValues[n].colour:Delete() listBoxValues[n].colour = wx.wxColourCopy(sudokuGUI.Colours_[n]) end + listBoxValues[sudokuGUI.VALUE_COLOUR].font:Delete() + listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font:Delete() listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) elseif ret == wx.wxNO then + listBoxValues[sel].colour:Delete() listBoxValues[sel].colour = wx.wxColourCopy(sudokuGUI.Colours_[sel]) if (sel == sudokuGUI.VALUE_COLOUR) then + listBoxValues[sel].font:Delete() listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) elseif (sel == sudokuGUI.POSS_VALUE_COLOUR) then + listBoxValues[sel].font:Delete() listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) end *************** *** 3437,3445 **** --- 3493,3504 ---- function sudokuGUI.PreferencesDialogPageUI.Apply() for n = 1, sudokuGUI.COLOUR_MAX do + sudokuGUI.Colours[n]:Delete() sudokuGUI.Colours[n] = wx.wxColourCopy(listBoxValues[n].colour) end -- copy the fonts since when applied their size will change + sudokuGUI.valueFont.wxfont:Delete() sudokuGUI.valueFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.VALUE_COLOUR].font) + sudokuGUI.possibleFont.wxfont:Delete() sudokuGUI.possibleFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font) *************** *** 3457,3460 **** --- 3516,3526 ---- end + function sudokuGUI.PreferencesDialogPageUI.Destroy() + for n = 1, sudokuGUI.COLOUR_MAX do + listBoxValues[n].colour:Delete() + if listBoxValues[n].font then listBoxValues[n].font:Delete() end + end + end + return panel end *************** *** 3536,3539 **** --- 3602,3608 ---- end + function sudokuGUI.PreferencesDialogPageShow.Destroy() + end + return panel end *************** *** 3615,3618 **** --- 3684,3690 ---- end + function sudokuGUI.PreferencesDialogPageSolve.Destroy() + end + return panel end *************** *** 3662,3667 **** dialog:ConnectEvent(wx.wxID_OK, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) ! local sel = notebook:GetSelection() ! if sel >= 0 then notebookPages[sel+1].Apply() end event:Skip() -- wxDialog will cancel automatically end) --- 3734,3750 ---- dialog:ConnectEvent(wx.wxID_OK, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) ! for n = 1, 3 do ! notebookPages[n].Apply() ! notebookPages[n].Destroy() ! end ! ! event:Skip() -- wxDialog will cancel automatically ! end) ! dialog:ConnectEvent(wx.wxID_CANCEL, wx.wxEVT_COMMAND_BUTTON_CLICKED, ! function (event) ! for n = 1, 3 do ! notebookPages[n].Destroy() ! end ! event:Skip() -- wxDialog will cancel automatically end) |
|
From: John L. <jr...@us...> - 2006-05-14 07:48:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1343/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: Add classinfo to the encapsulated classes for showing what they are in stacktree show the tracked class types in the stack tree use long for memory pointers not int in AddToTrackedMemory Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** staktree.cpp 4 May 2006 02:47:34 -0000 1.22 --- staktree.cpp 14 May 2006 07:48:09 -0000 1.23 *************** *** 375,393 **** wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); ! int derivedCount = 0, ! trackedCount = 0, ! eventHandlerCount = 0, ! windowCount = 0; ! derivedCount = wxlState.GetLuaStateData()->m_pDerivedList.size(); ! trackedCount = wxlState.GetLuaStateData()->m_pTrackedList.size(); ! eventHandlerCount = wxlState.GetLuaStateData()->m_eventHandlerList.GetCount(); ! windowCount = wxlState.GetLuaStateData()->m_windowList.GetCount(); ! treeControl->AppendItem(rootItem, wxT("Derived List"), 1, 1, new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), derivedCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), trackedCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), eventHandlerCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), windowCount), LUA_NOREF, 0)); } --- 375,395 ---- wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); ! int derivedCount = wxlState.GetLuaStateData()->m_pDerivedList.size(); ! int trackedCount = wxlState.GetLuaStateData()->m_pTrackedList.size(); ! int eventHandlerCount = wxlState.GetLuaStateData()->m_eventHandlerList.GetCount(); ! int windowCount = wxlState.GetLuaStateData()->m_windowList.GetCount(); ! wxLuaDebugDataItem* derivedItem = new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), derivedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* trackedItem = new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), trackedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* eventHandlerItem = new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), eventHandlerCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugDataItem* windowItem = new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxString::Format(wxT("%d"), windowCount), wxT(""), LUA_NOREF, 0); ! treeControl->AppendItem(rootItem, wxT("Derived List"), 1, 1, derivedItem); ! wxTreeItemId treeNode = treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, trackedItem); ! if (trackedCount > 0) m_treeControl->SetItemHasChildren(treeNode); ! ! treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, eventHandlerItem); ! treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, windowItem); } *************** *** 402,431 **** { wxLuaDebugDataItem *pDebugData = (wxLuaDebugDataItem *)m_treeControl->GetItemData(itemNode); ! if (pDebugData != NULL) { int nRef = pDebugData->GetReference(); if (nRef != LUA_NOREF) { int nIndex = pDebugData->GetIndex() + 1; - if (!pDebugData->IsExpanded()) - { - pDebugData->SetExpanded(true); ! if (m_luaInterface->IsDebugServer()) { ! m_luaInterface->EnumerateTable(nRef, nIndex, (long)itemNode.m_pItem); } ! else { ! // insert items ! wxLuaDebugData *pSortedList = m_luaInterface->EnumerateTable(nRef, nIndex); ! if (pSortedList != NULL) { ! FillTableEntry(itemNode, pSortedList); ! delete pSortedList; } } } ! } } } --- 404,468 ---- { wxLuaDebugDataItem *pDebugData = (wxLuaDebugDataItem *)m_treeControl->GetItemData(itemNode); ! if ((pDebugData != NULL) && !pDebugData->IsExpanded()) { + pDebugData->SetExpanded(true); + int nRef = pDebugData->GetReference(); if (nRef != LUA_NOREF) { int nIndex = pDebugData->GetIndex() + 1; ! if (m_luaInterface->IsDebugServer()) ! { ! m_luaInterface->EnumerateTable(nRef, nIndex, (long)itemNode.m_pItem); ! } ! else ! { ! // insert items ! wxLuaDebugData *pSortedList = m_luaInterface->EnumerateTable(nRef, nIndex); ! if (pSortedList != NULL) { ! FillTableEntry(itemNode, pSortedList); ! delete pSortedList; } ! } ! } ! else if (m_luaInterface->GetwxLuaState().Ok() && ! (pDebugData->GetName() == _("Tracked List"))) ! { ! wxLuaState wxlState(m_luaInterface->GetwxLuaState()); ! ! wxLongToLongHashMap::iterator it; ! wxLongToLongHashMap* hashMap = &wxlState.GetLuaStateRefData()->m_wxlStateData->m_pTrackedList; ! wxArrayString names; ! wxArrayInt counts; ! for (it = hashMap->begin(); it != hashMap->end(); ++it) ! { ! wxObject* obj = (wxObject*)it->second; ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) { ! wxString name(obj->GetClassInfo()->GetClassName()); ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) { ! names.Add(name); ! counts.Add(1); } + else + counts[idx]++; } } ! ! wxLuaDebugData* dataArr = new wxLuaDebugData; ! size_t n, count = names.GetCount(); ! for (n = 0; n < count; n++) ! { ! wxLuaDebugDataItem *item = new wxLuaDebugDataItem(names[n], wxT("wxLuaData"), wxString::Format(wxT("%d"), counts[n]), wxT(""), LUA_NOREF, pDebugData->GetIndex() + 1); ! dataArr->Add(item); ! } ! ! FillTableEntry(itemNode, dataArr); ! delete dataArr; ! } } } |
|
From: John L. <jr...@us...> - 2006-05-14 01:49:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxledit.cpp 20 Apr 2006 01:10:57 -0000 1.23 --- wxledit.cpp 14 May 2006 01:49:10 -0000 1.24 *************** *** 51,55 **** BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell) EVT_STESHELL_ENTER ( wxID_ANY, wxLuaShell::OnSTEEvent ) ! EVT_LUA_CONSOLE ( wxID_ANY, wxLuaShell::OnLua ) EVT_LUA_ERROR ( wxID_ANY, wxLuaShell::OnLua ) END_EVENT_TABLE() --- 51,55 ---- BEGIN_EVENT_TABLE(wxLuaShell, wxSTEditorShell) EVT_STESHELL_ENTER ( wxID_ANY, wxLuaShell::OnSTEEvent ) ! EVT_LUA_PRINT ( wxID_ANY, wxLuaShell::OnLua ) EVT_LUA_ERROR ( wxID_ANY, wxLuaShell::OnLua ) END_EVENT_TABLE() *************** *** 177,181 **** void wxLuaShell::OnLua(wxLuaEvent &event) { ! if (event.GetEventType() == wxEVT_LUA_CONSOLE) { AppendText(event.GetString() + wxT("\n")); --- 177,181 ---- void wxLuaShell::OnLua(wxLuaEvent &event) { ! if (event.GetEventType() == wxEVT_LUA_PRINT) { AppendText(event.GetString() + wxT("\n")); *************** *** 329,333 **** EVT_SIZE (wxLuaConsole::OnSize) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaConsole::OnLua) --- 329,333 ---- EVT_SIZE (wxLuaConsole::OnSize) ! EVT_LUA_PRINT (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaConsole::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaConsole::OnLua) *************** *** 793,797 **** } } ! else if (event.GetEventType() == wxEVT_LUA_CONSOLE) { outEditor->AppendText(event.GetString() + wxT("\n")); --- 793,797 ---- } } ! else if (event.GetEventType() == wxEVT_LUA_PRINT) { outEditor->AppendText(event.GetString() + wxT("\n")); |
|
From: John L. <jr...@us...> - 2006-05-14 01:49:13
|
Update of /cvsroot/wxlua/wxLua/apps/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/luamodule/src Modified Files: Makefile luamodule.cpp luamodule.wx.lua Added Files: wrapmodule.wx.lua Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luamodule.cpp 13 May 2006 21:05:35 -0000 1.1 --- luamodule.cpp 14 May 2006 01:49:10 -0000 1.2 *************** *** 52,56 **** BEGIN_EVENT_TABLE(wxLuaModuleApp, wxApp) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaModuleApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaModuleApp::OnLua) //EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaModuleApp::OnLua) --- 52,56 ---- BEGIN_EVENT_TABLE(wxLuaModuleApp, wxApp) ! EVT_LUA_PRINT (wxID_ANY, wxLuaModuleApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaModuleApp::OnLua) //EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaModuleApp::OnLua) --- NEW FILE: wrapmodule.wx.lua --- ----------------------------------------------------------------------------- -- Name: wrapmodule.wx.lua -- Purpose: Allow running wxLua programs using require by "appending" wx.wxGetApp():MainLoop() -- Author: John Labenski -- Modified by: -- Created: 05/13/2006 -- RCS-ID: -- Copyright: (c) 2001 John Labenski. All rights reserved. -- Licence: wxWidgets licence ----------------------------------------------------------------------------- -- Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua require("wx") assert(arg and arg[1] and (type(arg[1]) == "string"), "Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua") dofile(arg[1]) -- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active -- otherwise the lua program will exit immediately wx.wxGetApp():MainLoop() Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 13 May 2006 21:05:35 -0000 1.1 --- Makefile 14 May 2006 01:49:10 -0000 1.2 *************** *** 53,57 **** # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) #OBJECTS=luamodule.o --- 53,57 ---- # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) #OBJECTS=luamodule.o Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luamodule.wx.lua 13 May 2006 21:48:22 -0000 1.2 --- luamodule.wx.lua 14 May 2006 01:49:10 -0000 1.3 *************** *** 10,14 **** ----------------------------------------------------------------------------- ! require"wx" -- simple test of Non GUI elements --- 10,14 ---- ----------------------------------------------------------------------------- ! require("wx") -- simple test of Non GUI elements |
|
From: John L. <jr...@us...> - 2006-05-14 01:49:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/wxluafreeze/src Modified Files: wxluafreeze.cpp Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluafreeze.cpp 14 Apr 2006 04:27:23 -0000 1.6 --- wxluafreeze.cpp 14 May 2006 01:49:10 -0000 1.7 *************** *** 76,80 **** BEGIN_EVENT_TABLE(wxLuaFreezeApp, wxApp) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaFreezeApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaFreezeApp::OnLua) END_EVENT_TABLE() --- 76,80 ---- BEGIN_EVENT_TABLE(wxLuaFreezeApp, wxApp) ! EVT_LUA_PRINT (wxID_ANY, wxLuaFreezeApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaFreezeApp::OnLua) END_EVENT_TABLE() *************** *** 249,253 **** OutputPrint(event.GetString()); ! //if (event.GetEventType() == wxEVT_LUA_CONSOLE) //else if (event.GetEventType() == wxEVT_LUA_ERROR) } --- 249,253 ---- OutputPrint(event.GetString()); ! //if (event.GetEventType() == wxEVT_LUA_PRINT) //else if (event.GetEventType() == wxEVT_LUA_ERROR) } |
|
From: John L. <jr...@us...> - 2006-05-14 01:49:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/wxluacan/src Modified Files: cansim.cpp Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: cansim.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** cansim.cpp 7 Mar 2006 11:53:42 -0000 1.8 --- cansim.cpp 14 May 2006 01:49:10 -0000 1.9 *************** *** 280,284 **** BEGIN_EVENT_TABLE(MyApp, wxApp) ! EVT_LUA_CONSOLE (wxID_ANY, MyApp::OnLua) EVT_LUA_ERROR (wxID_ANY, MyApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, MyApp::OnLua) --- 280,284 ---- BEGIN_EVENT_TABLE(MyApp, wxApp) ! EVT_LUA_PRINT (wxID_ANY, MyApp::OnLua) EVT_LUA_ERROR (wxID_ANY, MyApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, MyApp::OnLua) *************** *** 310,314 **** void MyApp::OnLua( wxLuaEvent &event ) { ! if (event.GetEventType() == wxEVT_LUA_CONSOLE) { wxMessageBox(event.GetString(), wxT("maskpro")); --- 310,314 ---- void MyApp::OnLua( wxLuaEvent &event ) { ! if (event.GetEventType() == wxEVT_LUA_PRINT) { wxMessageBox(event.GetString(), wxT("maskpro")); |
|
From: John L. <jr...@us...> - 2006-05-14 01:49:12
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20100/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: change EVT_LUA_CONSOLE to EVT_LUA_PRINT add simple wrapper for running sample using require don't link to lua libs in luamodule Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxlua.cpp 18 Mar 2006 17:00:04 -0000 1.29 --- wxlua.cpp 14 May 2006 01:49:10 -0000 1.30 *************** *** 115,119 **** BEGIN_EVENT_TABLE(wxLuaStandaloneApp, wxApp) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaStandaloneApp::OnLua) --- 115,119 ---- BEGIN_EVENT_TABLE(wxLuaStandaloneApp, wxApp) ! EVT_LUA_PRINT (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaStandaloneApp::OnLua) *************** *** 370,374 **** void wxLuaStandaloneApp::OnLua( wxLuaEvent &event ) { ! if (event.GetEventType() == wxEVT_LUA_CONSOLE) { #ifdef __WXMSW__ --- 370,374 ---- void wxLuaStandaloneApp::OnLua( wxLuaEvent &event ) { ! if (event.GetEventType() == wxEVT_LUA_PRINT) { #ifdef __WXMSW__ |
|
From: John L. <jr...@us...> - 2006-05-14 00:40:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31140/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: add more docs add LuaDoString to math the other LuaDo functions rename EVT_LUA_CONSOLE to EVT_LUA_PRINT but use #defines for backwards compat Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** wxlstate.cpp 13 May 2006 21:05:36 -0000 1.66 --- wxlstate.cpp 14 May 2006 00:40:56 -0000 1.67 *************** *** 190,194 **** if (wxlState.Ok()) { ! wxLuaEvent event(wxEVT_LUA_CONSOLE, wxlState.GetId(), wxlState); event.SetString(msg); wxlState.SendEvent( event ); --- 190,194 ---- if (wxlState.Ok()) { ! wxLuaEvent event(wxEVT_LUA_PRINT, wxlState.GetId(), wxlState); event.SetString(msg); wxlState.SendEvent( event ); *************** *** 3495,3499 **** DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION) ! DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CONSOLE) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK) --- 3495,3499 ---- DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_CREATION) ! DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_PRINT) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_ERROR) DEFINE_LOCAL_EVENT_TYPE(wxEVT_LUA_DEBUG_HOOK) |
|
From: John L. <jr...@us...> - 2006-05-14 00:40:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31140/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: add more docs add LuaDoString to math the other LuaDo functions rename EVT_LUA_CONSOLE to EVT_LUA_PRINT but use #defines for backwards compat Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxlstate.h 4 May 2006 02:47:34 -0000 1.45 --- wxlstate.h 14 May 2006 00:40:56 -0000 1.46 *************** *** 308,311 **** --- 308,312 ---- // else nresults is LUA_MULTRET to leave all of them on the stack int LuaCall(int narg, int clear); + int LuaDoString(const wxString &script, const wxString& name = wxEmptyString) { return RunString(script, name); } int LuaDoFile(const wxString &filename) { return RunFile(filename); } int LuaDoBuffer(const char *buffer, size_t len, const char *name) { return RunBuffer((const unsigned char*)buffer, len, lua2wx(name)); } *************** *** 835,839 **** BEGIN_DECLARE_EVENT_TYPES() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION, 0) // a wxLuaState is being created ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CONSOLE, 0) // print statements and such, check GetString() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR, 0) // error occurred, check GetString() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function --- 836,840 ---- BEGIN_DECLARE_EVENT_TYPES() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_CREATION, 0) // a wxLuaState is being created ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_PRINT, 0) // print statements and such, check GetString() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_ERROR, 0) // error occurred, check GetString() DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_LUA_DEBUG_HOOK, 0) // see LuaDebugHook function *************** *** 845,849 **** #define EVT_LUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_CONSOLE(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CONSOLE, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #define EVT_LUA_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #define EVT_LUA_DEBUG_HOOK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), --- 846,850 ---- #define EVT_LUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_PRINT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #define EVT_LUA_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), #define EVT_LUA_DEBUG_HOOK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), *************** *** 851,853 **** --- 852,857 ---- #define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), + #define wxEVT_LUA_CONSOLE wxEVT_LUA_PRINT + #define EVT_LUA_CONSOLE EVT_LUA_PRINT + #endif // _WXLSTATE_H_ |
|
From: John L. <jr...@us...> - 2006-05-14 00:40:58
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31140/wxLua/docs Modified Files: wxlua.html Log Message: add more docs add LuaDoString to math the other LuaDo functions rename EVT_LUA_CONSOLE to EVT_LUA_PRINT but use #defines for backwards compat Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua.html 3 May 2006 22:52:17 -0000 1.4 --- wxlua.html 14 May 2006 00:40:55 -0000 1.5 *************** *** 3,12 **** <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! <title>wxLua Documentation</title> <meta content="John Labenski" name="author"> - </head> [...2505 lines suppressed...] ! ! ! <li>Returns lua's error code LUA_ERRXXX or 0 on sucess</li> ! ! ! ! </ul> ! ! ! <li>The other functions are documented in wxlstate.h.</li> ! ! ! </ul> <br> + </body> </html> |
|
From: John L. <jr...@us...> - 2006-05-13 22:37:09
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25597/website Modified Files: updatesite.sh Log Message: restore cvs1 even though it's gone since we can't use anon access, dunno? Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** updatesite.sh 13 May 2006 22:12:26 -0000 1.16 --- updatesite.sh 13 May 2006 22:37:07 -0000 1.17 *************** *** 1,7 **** #!/bin/sh # $Id$ ! export CVSROOT=:pserver:ano...@wx...:/cvsroot/wxlua # supposedly sourceforge will keep anonymous CVS in sync w/ devel CVS now and cvs1 is gone ! #export CVSROOT=:pserver:anonymous@cvs1:/cvsroot/wxlua --- 1,7 ---- #!/bin/sh # $Id$ ! #export CVSROOT=:pserver:ano...@wx...:/cvsroot/wxlua # supposedly sourceforge will keep anonymous CVS in sync w/ devel CVS now and cvs1 is gone ! export CVSROOT=:pserver:anonymous@cvs1:/cvsroot/wxlua |
|
From: John L. <jr...@us...> - 2006-05-13 22:12:30
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18150/website Modified Files: updatesite.sh Log Message: use anoncvs not cvs1 since it's gone Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** updatesite.sh 26 Apr 2006 05:26:28 -0000 1.15 --- updatesite.sh 13 May 2006 22:12:26 -0000 1.16 *************** *** 1,5 **** #!/bin/sh # $Id$ ! export CVSROOT=:pserver:anonymous@cvs1:/cvsroot/wxlua echo Checking out website to htdocs dir from CVS --- 1,8 ---- #!/bin/sh # $Id$ ! export CVSROOT=:pserver:ano...@wx...:/cvsroot/wxlua ! # supposedly sourceforge will keep anonymous CVS in sync w/ devel CVS now and cvs1 is gone ! #export CVSROOT=:pserver:anonymous@cvs1:/cvsroot/wxlua ! echo Checking out website to htdocs dir from CVS |
|
From: John L. <jr...@us...> - 2006-05-13 21:48:25
|
Update of /cvsroot/wxlua/wxLua/apps/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10690/src Modified Files: luamodule.wx.lua Log Message: use wxGetApp not wxGetBaseApp as it's deprecated Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/luamodule/src/luamodule.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luamodule.wx.lua 13 May 2006 21:05:35 -0000 1.1 --- luamodule.wx.lua 13 May 2006 21:48:22 -0000 1.2 *************** *** 29,34 **** frame:Show(true) ! -- ALWAYS call wx.wxGetBaseApp():MainLoop() last to keep the program active -- otherwise the lua program will exit immediately ! wx.wxGetBaseApp():MainLoop() --- 29,34 ---- frame:Show(true) ! -- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active -- otherwise the lua program will exit immediately ! wx.wxGetApp():MainLoop() |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 12 Dec 2005 05:16:32 -0000 1.6 --- Makefile 13 May 2006 21:05:36 -0000 1.7 *************** *** 35,39 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) --- 35,39 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/modules/wxluadebug/src Modified Files: Makefile Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 31 Jan 2006 04:31:12 -0000 1.5 --- Makefile 13 May 2006 21:05:36 -0000 1.6 *************** *** 35,39 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) --- 35,39 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:39
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/modules/lua/src Modified Files: Makefile lstate.c Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 30 Mar 2006 02:48:40 -0000 1.3 --- Makefile 13 May 2006 21:05:36 -0000 1.4 *************** *** 5,13 **** # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= # Your platform. See PLATS for possible values. PLAT= none CC= gcc ! CFLAGS= -O2 -Wall $(MYCFLAGS) AR= ar rcu RANLIB= ranlib --- 5,16 ---- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= + # allow interception of coroutine created lua_States + WXLUACFLAGS = -DWXLUA_LUA_NEWTHREAD + # Your platform. See PLATS for possible values. PLAT= none CC= gcc ! CFLAGS= -O2 -Wall $(MYCFLAGS) $(WXLUACFLAGS) AR= ar rcu RANLIB= ranlib Index: lstate.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstate.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lstate.c 2 May 2006 22:46:53 -0000 1.3 --- lstate.c 13 May 2006 21:05:36 -0000 1.4 *************** *** 116,121 **** } ! #define WXLUA_CODE /* wxlua - always define this since if not set it does nothing */ ! #ifndef WXLUA_CODE lua_State *luaE_newthread (lua_State *L) { lua_State *L1 = tostate(luaM_malloc(L, state_size(lua_State))); --- 116,120 ---- } ! #ifndef WXLUA_LUA_NEWTHREAD lua_State *luaE_newthread (lua_State *L) { lua_State *L1 = tostate(luaM_malloc(L, state_size(lua_State))); *************** *** 140,144 **** luaM_freemem(L, fromstate(L1), state_size(lua_State)); } ! #else // !WXLUA_CODE /* wxlua - track child threads see wxLuaState */ //#include <luathread.h> --- 139,143 ---- luaM_freemem(L, fromstate(L1), state_size(lua_State)); } ! #else // WXLUA_LUA_NEWTHREAD is defined /* wxlua - track child threads see wxLuaState */ //#include <luathread.h> *************** *** 194,198 **** luaM_freemem(L, fromstate(L1), state_size(lua_State)); } ! #endif // WXLUA_CODE --- 193,197 ---- luaM_freemem(L, fromstate(L1), state_size(lua_State)); } ! #endif // WXLUA_LUA_NEWTHREAD |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/modules/wxbind/src Modified Files: Makefile Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 8 Mar 2006 02:46:37 -0000 1.9 --- Makefile 13 May 2006 21:05:36 -0000 1.10 *************** *** 38,42 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I../setup -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) --- 38,42 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I../setup -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:39
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/apps/wxluafreeze/src Modified Files: Makefile Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 12 Apr 2006 05:03:01 -0000 1.1 --- Makefile 13 May 2006 21:05:35 -0000 1.2 *************** *** 47,51 **** WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 47,51 ---- WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD # This will build a static wxLua app, staticly linked to .a libs |
|
From: John L. <jr...@us...> - 2006-05-13 21:05:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29246/wxLua/modules/wxbindstc/src Modified Files: Makefile Log Message: use #define WXLUA_LUA_NEWTHREAD for thread handler code, was WXLUA_CODE define add luamodule "app" which generates a library for using wxLua as a module in lua Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 4 Mar 2006 16:14:07 -0000 1.5 --- Makefile 13 May 2006 21:05:36 -0000 1.6 *************** *** 36,40 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I$(WXLUA_DIR)/modules -I$(WXLUA_WXLUASETUP_DIR) -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluastc-$(WXRELEASE) --- 36,40 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I$(WXLUA_DIR)/modules -I$(WXLUA_WXLUASETUP_DIR) -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluastc-$(WXRELEASE) |
