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-24 17:21:15
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17171/modules Modified Files: Makefile.in Log Message: fixed some dependencies for DLL builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Makefile.in 24 May 2006 08:51:04 -0000 1.43 --- Makefile.in 24 May 2006 17:20:55 -0000 1.44 *************** *** 1049,1053 **** @COND_SHARED_1_USE_WXBINDSTC_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___macinstnamecmd) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)lib $(__wxbindstc_dll___importlib) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) --- 1049,1053 ---- @COND_SHARED_1_USE_WXBINDSTC_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXBINDSTC_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXBINDSTC_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___macinstnamecmd) $(__wxbindstc_dll___soname_flags) $(dll___macver) -L$(top_builddir)lib $(__wxbindstc_dll___importlib) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXBINDSTC_1@ @COND_SHARED_1_USE_WXBINDSTC_1@ $(__wxbindstc_dll___so_symlinks_cmd) *************** *** 1159,1163 **** @COND_SHARED_1_USE_WXLUASOCKET_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)lib $(__wxluasocket_dll___importlib) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(__wxluasocket_dll___so_symlinks_cmd) --- 1159,1163 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(dll___targetsuf3): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(dll___macver) -L$(top_builddir)lib $(__wxluasocket_dll___importlib) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_WXLUASOCKET_1@ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(__wxluasocket_dll___so_symlinks_cmd) |
|
From: Francesco M. <fr...@us...> - 2006-05-24 17:21:11
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17171/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxbindstc.dsp modules_mod_wxluasocket.dsp Log Message: fixed some dependencies for DLL builds Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.bcc 24 May 2006 08:51:05 -0000 1.49 --- makefile.bcc 24 May 2006 17:20:56 -0000 1.50 *************** *** 800,804 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 800,804 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 832,836 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 832,836 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** makefile.wat 24 May 2006 08:51:05 -0000 1.48 --- makefile.wat 24 May 2006 17:20:56 -0000 1.49 *************** *** 984,988 **** @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDSTC_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc system nr_dll --- 984,988 ---- @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDSTC_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc system nr_dll *************** *** 1036,1040 **** @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc system nr_dll --- 1036,1040 ---- @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc system nr_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.gcc 24 May 2006 08:51:05 -0000 1.49 --- makefile.gcc 24 May 2006 17:20:56 -0000 1.50 *************** *** 870,874 **** ifeq ($(USE_WXBINDSTC),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 870,874 ---- ifeq ($(USE_WXBINDSTC),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 902,906 **** ifeq ($(USE_WXLUASOCKET),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 902,906 ---- ifeq ($(USE_WXLUASOCKET),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** modules_mod_wxluasocket.dsp 24 May 2006 08:51:05 -0000 1.24 --- modules_mod_wxluasocket.dsp 24 May 2006 17:20:56 -0000 1.25 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Debug Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Release Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Release Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Debug Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Debug Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" ! # ADD LINK32 wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Unicode Debug Monolithic" Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** makefile.vc 24 May 2006 08:51:05 -0000 1.48 --- makefile.vc 24 May 2006 17:20:56 -0000 1.49 *************** *** 797,801 **** ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif --- 797,801 ---- ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif *************** *** 827,831 **** ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << !endif --- 827,831 ---- ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: $(WXLUASOCKET_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << !endif Index: modules_mod_wxbindstc.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbindstc.dsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** modules_mod_wxbindstc.dsp 21 May 2006 09:55:24 -0000 1.16 --- modules_mod_wxbindstc.dsp 24 May 2006 17:20:56 -0000 1.17 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Debug Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-05-24 17:21:03
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17171/modules/build/bakefiles Modified Files: modules.bkl Log Message: fixed some dependencies for DLL builds Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** modules.bkl 21 May 2006 14:43:36 -0000 1.36 --- modules.bkl 24 May 2006 17:20:56 -0000 1.37 *************** *** 127,130 **** --- 127,131 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> + <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> *************** *** 149,152 **** --- 150,154 ---- <module-name>WXLUASOCKET</module-name> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> *************** *** 163,167 **** <sources>$(LUAMODULE_SRC)</sources> <headers>$(LUAMODULE_HDR)</headers> ! <define>WXMAKINGDLL_LUAMODULE</define> --- 165,169 ---- <sources>$(LUAMODULE_SRC)</sources> <headers>$(LUAMODULE_HDR)</headers> ! <define>WXMAKINGDLL_LUAMODULE</define> |
|
From: Francesco M. <fr...@us...> - 2006-05-24 17:02:44
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10220/modules/wxbind/src Modified Files: file.cpp gdi.cpp menutool.cpp Log Message: fixing borland builds Index: menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** menutool.cpp 15 May 2006 21:55:35 -0000 1.15 --- menutool.cpp 24 May 2006 17:02:41 -0000 1.16 *************** *** 71,75 **** long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // int table if (lua_istable(L, 1)) --- 71,75 ---- long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // int table if (lua_istable(L, 1)) Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** file.cpp 24 May 2006 15:45:52 -0000 1.18 --- file.cpp 24 May 2006 17:02:41 -0000 1.19 *************** *** 2074,2078 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // wxString * filename wxString filename; --- 2074,2078 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // wxString * filename wxString filename; Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** gdi.cpp 18 May 2006 05:47:39 -0000 1.25 --- gdi.cpp 24 May 2006 17:02:41 -0000 1.26 *************** *** 3281,3285 **** bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxT("")); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; --- 3281,3285 ---- bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; |
|
From: Francesco M. <fr...@us...> - 2006-05-24 16:56:55
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7938 Modified Files: override.hpp Log Message: fixing borland builds Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** override.hpp 24 May 2006 15:45:52 -0000 1.43 --- override.hpp 24 May 2006 16:56:45 -0000 1.44 *************** *** 1968,1972 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // wxString * filename wxString filename; --- 1968,1972 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // wxString * filename wxString filename; *************** *** 2234,2238 **** bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxT("")); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; --- 2234,2238 ---- bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; *************** *** 3276,3280 **** long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxT("")); // int table if (lua_istable(L, 1)) --- 3276,3280 ---- long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // int table if (lua_istable(L, 1)) |
|
From: John L. <jr...@us...> - 2006-05-24 15:45:59
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13669/wxLua/bindings Modified Files: genwxbind.bat Log Message: fix override to use wxString(wxT("")) for : ? operator Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** genwxbind.bat 26 Mar 2006 23:39:04 -0000 1.6 --- genwxbind.bat 24 May 2006 15:45:52 -0000 1.7 *************** *** 8,11 **** --- 8,12 ---- %LUA% -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets\error.txt %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt + %LUA% -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket\error.txt echo Done. |
|
From: John L. <jr...@us...> - 2006-05-24 15:45:58
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13669/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: fix override to use wxString(wxT("")) for : ? operator Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** override.hpp 24 May 2006 04:50:00 -0000 1.42 --- override.hpp 24 May 2006 15:45:52 -0000 1.43 *************** *** 2014,2018 **** int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxT("")); // wxArrayString *files wxArrayString files; --- 2014,2018 ---- int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; |
|
From: John L. <jr...@us...> - 2006-05-24 15:45:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13669/wxLua/modules/wxbind/src Modified Files: file.cpp Log Message: fix override to use wxString(wxT("")) for : ? operator Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** file.cpp 18 May 2006 05:47:39 -0000 1.17 --- file.cpp 24 May 2006 15:45:52 -0000 1.18 *************** *** 2000,2004 **** int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxT("")); // wxArrayString *files wxArrayString files; --- 2000,2004 ---- int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; |
|
From: John L. <jr...@us...> - 2006-05-24 15:41:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12326/wxluasocket Added Files: override.hpp Log Message: add override file for wxluasocket binding --- NEW FILE: override.hpp --- %override wxLua_wxLuaDebugServerCompile_constructor // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); // const wxString &fileName wxString fileName = lua2wx(wxlState.GetStringType(2)); // const wxString &buffer wxString buffer = lua2wx(wxlState.GetStringType(1)); // compile the file bool fResult = wxLuaDebugServer::Compile(buffer, fileName); // push result lua_pushboolean(L, fResult); // return the number of parameters return 1; } %end |
|
From: Francesco M. <fr...@us...> - 2006-05-24 15:20:12
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4495 Modified Files: updatesite.sh Log Message: fixed scripts for EOL Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** updatesite.sh 16 May 2006 20:12:51 -0000 1.25 --- updatesite.sh 24 May 2006 15:20:01 -0000 1.26 *************** *** 2,11 **** # $Id$ export CVSROOT=:pserver:ano...@wx...s:/cvsroot/wxlua function restorepermissions { echo Restoring permissions ! cd /home/groups/w/wx/wxlua/htdocs # note: the user permissions must be set, too otherwise the owner --- 2,16 ---- # $Id$ + + # script globals export CVSROOT=:pserver:ano...@wx...s:/cvsroot/wxlua + wxluadir="/home/groups/w/wx/wxlua" + + function restorepermissions { echo Restoring permissions ! cd $wxluadir/htdocs # note: the user permissions must be set, too otherwise the owner *************** *** 17,56 **** } ! echo Checking out website to htdocs dir from cvs ! cd /home/groups/w/wx/wxlua ! cvs -q checkout -P -d htdocs website ! echo Checking out the docs dir to the htdocs/docs dir from cvs ! cd /home/groups/w/wx/wxlua/htdocs ! cvs -q checkout -P -d docs wxLua/docs ! echo Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs ! cd /home/groups/w/wx/wxlua/htdocs ! cvs -q checkout -P wxLua # if user called this with a non-empty argument, limit the # update to the main website only if [ ! -z "$1" ]; then ! echo "Not generating docs and tarball as per user request." restorepermissions exit 0 fi ! echo Generate Doxygen documentation ! cd /home/groups/w/wx/wxlua/htdocs/docs ! doxygen doxygen_website.cfg ! ! echo Create nightly tarball ! cd /home/groups/w/wx/wxlua/htdocs/download ! cvs -q checkout -P wxLua ! cd /home/groups/w/wx/wxlua/htdocs/download/wxLua ! ../add_crlf_to_dsp_dsw ! cd /home/groups/w/wx/wxlua/htdocs/download ! tar \ ! --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=cvs \ ! --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz ! echo Since we modified the cvs with add_crlf_to_dsp_dsw we should delete it ! rm -Rf wxLua ! echo Deleting tarballs created more than 1 week ago ! find . -type f -mtime +7 -path "./wxLua_Snapshot_*" | xargs rm -f ! restorepermissions --- 22,84 ---- } + function updatefromcvs + { + echo "Checking out website to htdocs dir from cvs" + cd $wxluadir + cvs -q checkout -P -d htdocs website + + echo "Checking out the docs dir to the htdocs/docs dir from cvs" + cd htdocs + cvs -q checkout -P -d docs wxLua/docs + + echo "Checking out the whole wxLua cvs repository to the htdocs/wxLua dir from cvs" + cd $wxluadir/htdocs + cvs -q checkout -P wxLua + } + + function createdocs + { + echo "Generating Doxygen documentation" + cd $wxluadir/htdocs/docs + doxygen doxygen_website.cfg + } + + function createsnapshot + { + echo "Creating snapshot" + cd $wxluadir/htdocs/download + + cp -rf ../wxLua . + ./fixeol.sh + tar \ + --wildcards --exclude=*.o --exclude=*.d --exclude=*.obj \ + --exclude=*.dll --exclude=*.exe --exclude=*.a --exclude=*.d --exclude=cvs \ + --create wxLua/* | gzip -c > wxLua_Snapshot_`date +%F`.tar.gz + + # remove temporary copy of wxLua modified by fixeol script + rm -Rf wxLua + } + + function removeoldsnapshots + { + # cleanup old tarballs + echo "Deleting snapshots created more than 1 week ago" + find . -type f -mtime +7 -path "./wxLua_Snapshot_*" | xargs rm -f + } ! ! ! updatefromcvs # if user called this with a non-empty argument, limit the # update to the main website only if [ ! -z "$1" ]; then ! echo "Not regenerating docs and snapshot as per user request." restorepermissions exit 0 fi ! createdocs ! createsnapshot ! removeoldsnapshots restorepermissions |
|
From: Francesco M. <fr...@us...> - 2006-05-24 15:20:12
|
Update of /cvsroot/wxlua/website/download In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4495/download Added Files: fixeol.sh Log Message: fixed scripts for EOL --- NEW FILE: fixeol.sh --- #!/bin/sh # the directory where file2convert are cmd=unix2dos dir=`pwd`/wxLua # NOT NECESSARY AS unix2dos will already print out the names of the processed files # for f in `find .|grep ".dsp"`; do echo $f; done # for f in `find .|grep ".dsw"`; do echo $f; done # for f in `find .|grep "makefile.vc"`; do echo $f; done # for f in `find .|grep "makefile.wat"`; do echo $f; done # for f in `find .|grep "makefile.bcc"`; do echo $f; done # do the UNIX -> DOS conversion for f in `find $dir|grep ".dsp"`; do $cmd $f; done for f in `find $dir|grep ".dsw"`; do $cmd $f; done for f in `find $dir|grep "makefile.vc"`; do $cmd $f; done for f in `find $dir|grep "makefile.wat"`; do $cmd $f; done for f in `find $dir|grep "makefile.bcc"`; do $cmd $f; done |
|
From: Francesco M. <fr...@us...> - 2006-05-24 08:51:16
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27219/modules Modified Files: Makefile.in Log Message: rebaked after wxluasocket changes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Makefile.in 21 May 2006 19:16:59 -0000 1.42 --- Makefile.in 24 May 2006 08:51:04 -0000 1.43 *************** *** 299,302 **** --- 299,303 ---- $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ + wxluasocket_lib_wxluasocket_bind.o \ wxluasocket_lib_wxlsock.o \ wxluasocket_lib_wxlhandl.o \ *************** *** 304,312 **** wxluasocket_lib_wxldtarg.o \ wxluasocket_lib_wxldserv.o \ ! wxluasocket_lib_dservice.o WXLUASOCKET_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUASOCKET \ $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ wxluasocket_dll_wxlsock.o \ wxluasocket_dll_wxlhandl.o \ --- 305,315 ---- wxluasocket_lib_wxldtarg.o \ wxluasocket_lib_wxldserv.o \ ! wxluasocket_lib_dservice.o \ ! wxluasocket_lib_wxluasocket.o WXLUASOCKET_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUASOCKET \ $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ + wxluasocket_dll_wxluasocket_bind.o \ wxluasocket_dll_wxlsock.o \ wxluasocket_dll_wxlhandl.o \ *************** *** 314,318 **** wxluasocket_dll_wxldtarg.o \ wxluasocket_dll_wxldserv.o \ ! wxluasocket_dll_dservice.o MOD_LUAMODULE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -DWXMAKINGDLL_LUAMODULE $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) --- 317,322 ---- wxluasocket_dll_wxldtarg.o \ wxluasocket_dll_wxldserv.o \ ! wxluasocket_dll_dservice.o \ ! wxluasocket_dll_wxluasocket.o MOD_LUAMODULE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -DWXMAKINGDLL_LUAMODULE $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) *************** *** 1142,1146 **** @COND_SHARED_0_USE_WXLUASOCKET_1@install_wxluasocket_lib_headers: @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1146,1150 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@install_wxluasocket_lib_headers: @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1150,1154 **** @COND_SHARED_0_USE_WXLUASOCKET_1@uninstall_wxluasocket_lib_headers: ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUASOCKET_1@ done --- 1154,1158 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@uninstall_wxluasocket_lib_headers: ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUASOCKET_1@ done *************** *** 1171,1175 **** @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll_headers: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1175,1179 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll_headers: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1179,1183 **** @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done --- 1183,1187 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done *************** *** 1811,1814 **** --- 1815,1821 ---- $(CXXC) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluadebug/src/staktree.cpp + wxluasocket_lib_wxluasocket_bind.o: $(top_srcdir)/modules/wxluasocket/src/wxluasocket_bind.cpp + $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxluasocket_bind.cpp + wxluasocket_lib_wxlsock.o: $(top_srcdir)/modules/wxluasocket/src/wxlsock.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxlsock.cpp *************** *** 1829,1832 **** --- 1836,1845 ---- $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/dservice.cpp + wxluasocket_lib_wxluasocket.o: $(top_srcdir)/modules/wxluasocket/src/wxluasocket.cpp + $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxluasocket.cpp + + wxluasocket_dll_wxluasocket_bind.o: $(top_srcdir)/modules/wxluasocket/src/wxluasocket_bind.cpp + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxluasocket_bind.cpp + wxluasocket_dll_wxlsock.o: $(top_srcdir)/modules/wxluasocket/src/wxlsock.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxlsock.cpp *************** *** 1847,1850 **** --- 1860,1866 ---- $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/dservice.cpp + wxluasocket_dll_wxluasocket.o: $(top_srcdir)/modules/wxluasocket/src/wxluasocket.cpp + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxluasocket.cpp + mod_luamodule_luamodule.o: $(top_srcdir)/modules/luamodule/src/luamodule.cpp $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(top_srcdir)/modules/luamodule/src/luamodule.cpp |
|
From: Francesco M. <fr...@us...> - 2006-05-24 08:51:13
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27219/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxluasocket.dsp Log Message: rebaked after wxluasocket changes Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** makefile.vc 21 May 2006 19:16:59 -0000 1.47 --- makefile.vc 24 May 2006 08:51:05 -0000 1.48 *************** *** 398,401 **** --- 398,402 ---- $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \ *************** *** 403,407 **** msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj WXLUASOCKET_DLL_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ --- 404,409 ---- msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj WXLUASOCKET_DLL_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ *************** *** 414,417 **** --- 416,420 ---- /DWXMAKINGDLL_WXLUASOCKET /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \ *************** *** 419,423 **** msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj MOD_LUAMODULE_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ --- 422,427 ---- msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj \ ! msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj MOD_LUAMODULE_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ *************** *** 1416,1419 **** --- 1420,1426 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** *************** *** 1434,1437 **** --- 1441,1450 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + + msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** *************** *** 1452,1455 **** --- 1465,1471 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp $(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** makefile.bcc 21 May 2006 19:16:59 -0000 1.48 --- makefile.bcc 24 May 2006 08:51:05 -0000 1.49 *************** *** 400,403 **** --- 400,404 ---- $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \ *************** *** 405,409 **** borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ --- 406,411 ---- borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ *************** *** 414,417 **** --- 416,420 ---- -DWXMAKINGDLL_WXLUASOCKET $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \ *************** *** 419,423 **** borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj MOD_LUAMODULE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 422,427 ---- borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj \ ! borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj MOD_LUAMODULE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 1422,1425 **** --- 1426,1432 ---- $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** *************** *** 1440,1443 **** --- 1447,1456 ---- $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** *************** *** 1458,1461 **** --- 1471,1477 ---- $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) $** Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** modules_mod_wxluasocket.dsp 21 May 2006 09:55:24 -0000 1.23 --- modules_mod_wxluasocket.dsp 24 May 2006 08:51:05 -0000 1.24 *************** *** 475,478 **** --- 475,486 ---- SOURCE=..\..\wxluasocket\src\wxlsock.cpp # End Source File + # Begin Source File + + SOURCE=..\..\wxluasocket\src\wxluasocket.cpp + # End Source File + # Begin Source File + + SOURCE=..\..\wxluasocket\src\wxluasocket_bind.cpp + # End Source File # End Group # Begin Group "WXLUASOCKET headers" *************** *** 505,508 **** --- 513,520 ---- # Begin Source File + SOURCE=..\..\wxluasocket\include\wxluasocket_bind.h + # End Source File + # Begin Source File + SOURCE=..\..\wxluasocket\include\wxluasocketdefs.h # End Source File Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** makefile.wat 21 May 2006 19:16:59 -0000 1.47 --- makefile.wat 24 May 2006 08:51:05 -0000 1.48 *************** *** 808,811 **** --- 808,812 ---- -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj & *************** *** 813,817 **** watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj WXLUASOCKET_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 814,819 ---- watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj WXLUASOCKET_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 822,825 **** --- 824,828 ---- $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj & *************** *** 827,831 **** watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj MOD_LUAMODULE_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & --- 830,835 ---- watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.obj & ! watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj MOD_LUAMODULE_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & *************** *** 1638,1641 **** --- 1642,1648 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< *************** *** 1656,1659 **** --- 1663,1672 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket_bind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< *************** *** 1674,1677 **** --- 1687,1693 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\mod_luamodule_luamodule.obj : .AUTODEPEND ..\..\luamodule\src\luamodule.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MOD_LUAMODULE_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** makefile.gcc 21 May 2006 19:16:59 -0000 1.48 --- makefile.gcc 24 May 2006 08:51:05 -0000 1.49 *************** *** 357,360 **** --- 357,361 ---- $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o \ *************** *** 362,366 **** mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.o WXLUASOCKET_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 363,368 ---- mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.o WXLUASOCKET_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 370,373 **** --- 372,376 ---- -DWXMAKINGDLL_WXLUASOCKET $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o \ *************** *** 375,379 **** mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.o MOD_LUAMODULE_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 378,383 ---- mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_dservice.o \ ! mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.o MOD_LUAMODULE_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 1491,1494 **** --- 1495,1501 ---- $(CXX) -c -o $@ $(WXLUADEBUG_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket_bind.o: ../../wxluasocket/src/wxluasocket_bind.cpp + $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1509,1512 **** --- 1516,1525 ---- $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp + $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< + + mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket_bind.o: ../../wxluasocket/src/wxluasocket_bind.cpp + $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< *************** *** 1527,1530 **** --- 1540,1546 ---- $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp + $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\mod_luamodule_luamodule.o: ../../luamodule/src/luamodule.cpp $(CXX) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(CPPDEPS) $< |
|
From: John L. <jr...@us...> - 2006-05-24 04:53:55
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6138/wxLua/modules/wxluasocket/src Added Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: added wxluasocket bindings to go into modules/wxluasocket instead of wxwidgets bindings --- NEW FILE: wxluasocket_bind.cpp --- // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. // ---------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxluasocket/include/wxluasocket_bind.h" #include "wx/wxprec.h" // ---------------------------------------------------------------------------- // wxLuaGetEventList_wxluasocket() is called to register events // ---------------------------------------------------------------------------- WXLUAEVENT* wxLuaGetEventList_wxluasocket(size_t &count) { static WXLUAEVENT eventList[] = { { &wxEVT_WXLUA_DEBUG_BREAK, "wxEVT_WXLUA_DEBUG_BREAK", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, "wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_ERROR, "wxEVT_WXLUA_DEBUG_ERROR", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, "wxEVT_WXLUA_DEBUG_EVALUATE_EXPR", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_EXIT, "wxEVT_WXLUA_DEBUG_EXIT", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_PRINT, "wxEVT_WXLUA_DEBUG_PRINT", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, "wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_STACK_ENUM, "wxEVT_WXLUA_DEBUG_STACK_ENUM", &s_wxluatag_wxLuaDebugEvent }, { &wxEVT_WXLUA_DEBUG_TABLE_ENUM, "wxEVT_WXLUA_DEBUG_TABLE_ENUM", &s_wxluatag_wxLuaDebugEvent }, { 0, 0, 0 }, }; count = (sizeof(eventList)/sizeof(eventList[0])) - 1; return eventList; } // ---------------------------------------------------------------------------- // wxLuaGetDefineList_wxluasocket() is called to register defines and enums // ---------------------------------------------------------------------------- WXLUADEFINE* wxLuaGetDefineList_wxluasocket(size_t &count) { static WXLUADEFINE defineList[] = { // -------------------------------------------------------------------- // %define // -------------------------------------------------------------------- // -------------------------------------------------------------------- // %enum // -------------------------------------------------------------------- { 0, 0 }, }; count = (sizeof(defineList)/sizeof(defineList[0])) - 1; return defineList; } // ---------------------------------------------------------------------------- // wxLuaGetStringList_wxluasocket() is called to register strings // ---------------------------------------------------------------------------- WXLUASTRING* wxLuaGetStringList_wxluasocket(size_t &count) { static WXLUASTRING stringList[] = { // -------------------------------------------------------------------- // %define %string // -------------------------------------------------------------------- { 0, 0 }, }; count = (sizeof(stringList)/sizeof(stringList[0])) - 1; return stringList; } // ---------------------------------------------------------------------------- // wxLuaGetObjectList_wxluasocket() is called to register object and pointer bindings // ---------------------------------------------------------------------------- WXLUAOBJECT* wxLuaGetObjectList_wxluasocket(size_t &count) { static WXLUAOBJECT objectList[] = { { 0, 0, 0, 0 }, }; count = (sizeof(objectList)/sizeof(objectList[0])) - 1; return objectList; } // ---------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluasocket() is called to register global functions // ---------------------------------------------------------------------------- WXLUAMETHOD* wxLuaGetFunctionList_wxluasocket(size_t &count) { static WXLUAMETHOD functionList[] = { { LuaGlobal, 0, 0, 0, 0, {0} }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; return functionList; } WXLUACLASS* wxLuaGetClassList_wxluasocket(size_t &count) { static WXLUACLASS classList[] = { { "wxLuaDebugData", wxLuaDebugData_methods, wxLuaDebugData_methodCount, -1, NULL, &s_wxluatag_wxLuaDebugData, NULL }, { "wxLuaDebugEvent", wxLuaDebugEvent_methods, wxLuaDebugEvent_methodCount, -1, CLASSINFO(wxLuaDebugEvent), &s_wxluatag_wxLuaDebugEvent, "wxEvent" }, { "wxLuaDebugServer", wxLuaDebugServer_methods, wxLuaDebugServer_methodCount, -1, NULL, &s_wxluatag_wxLuaDebugServer, NULL }, { 0, 0, 0, 0, 0, 0, 0 }, }; count = (sizeof(classList)/sizeof(classList[0])) - 1; return classList; } // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxluasocket() is called to register classes // ---------------------------------------------------------------------------- // binding class extern WXLUACLASS *wxLuaGetClassList_wxluasocket(size_t &count); extern WXLUADEFINE *wxLuaGetDefineList_wxluasocket(size_t &count); extern WXLUASTRING *wxLuaGetStringList_wxluasocket(size_t &count); extern WXLUAEVENT *wxLuaGetEventList_wxluasocket(size_t &count); extern WXLUAOBJECT *wxLuaGetObjectList_wxluasocket(size_t &count); extern WXLUAMETHOD *wxLuaGetFunctionList_wxluasocket(size_t &count); IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding_wxluasocket, wxLuaBinding) wxLuaBinding_wxluasocket::wxLuaBinding_wxluasocket() : wxLuaBinding() { m_nameSpace = wxT("wx"); pfGetClassList = wxLuaGetClassList_wxluasocket; pfGetDefineList = wxLuaGetDefineList_wxluasocket; pfGetStringList = wxLuaGetStringList_wxluasocket; pfGetEventList = wxLuaGetEventList_wxluasocket; pfGetObjectList = wxLuaGetObjectList_wxluasocket; pfGetBuiltinList = wxLuaGetFunctionList_wxluasocket; Initialize(); } void wxLuaBinding_wxluasocket::PreRegister(const wxLuaState& , bool , int ) { } void wxLuaBinding_wxluasocket::PostRegister(const wxLuaState& , bool , int ) { } // bind wxLuaBinding_wxluasocket to a single wxLuaState extern bool wxLuaBinding_wxluasocket_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluasocket for all wxLuaStates extern bool wxLuaBinding_wxluasocket_init(); // bind wxLuaBinding_wxluasocket to a single wxLuaState bool wxLuaBinding_wxluasocket_bind(const wxLuaState& wxlState_) { wxLuaState wxlState(wxlState_); wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); wxASSERT(!wxlState.GetLuaStateData()->m_typesRegistered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluasocket"))); // ignore binding request when we already have wxluasocket registered if (wxlState.GetLuaBinding(wxT("wxluasocket"))) return false; wxlState.GetLuaStateData()->m_bindings.Append(new wxLuaBinding_wxluasocket()); return true; } // initialize wxLuaBinding_wxluasocket for all wxLuaStates bool wxLuaBinding_wxluasocket_init() { static wxLuaBinding_wxluasocket m_binding; wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding); if (node && (node->GetData() == &m_binding)) return false; wxLuaBinding::GetBindingList()->Append(&m_binding); return true; } --- NEW FILE: wxluasocket.cpp --- // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file is regenerated. // ---------------------------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/wxlstate.h" #include "wxluasocket/include/wxluasocket_bind.h" #include "wx/wxprec.h" // ------------------------------------------------------------------------------------------------- // Bind class wxLuaDebugServer // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxLuaDebugServer = -1; // wxLuaDebugServer(int portNumber) static int LUACALL wxLua_wxLuaDebugServer_constructor(lua_State *L) { wxLuaState wxlState(L); wxLuaDebugServer *returns; // int portNumber int portNumber = (int)wxlState.GetNumberType(1); // call constructor returns = new wxLuaDebugServer(portNumber); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxLuaDebugServer *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaDebugServer, returns); return 1; } // %override wxLua_wxLuaDebugServerCompile_constructor // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); // const wxString &fileName wxString fileName = lua2wx(wxlState.GetStringType(2)); // const wxString &buffer wxString buffer = lua2wx(wxlState.GetStringType(1)); // compile the file bool fResult = wxLuaDebugServer::Compile(buffer, fileName); // push result lua_pushboolean(L, fResult); // return the number of parameters return 1; } // bool StartClient() static int LUACALL wxLua_wxLuaDebugServer_StartClient(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StartClient returns = self->StartClient(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool StartServerThread() static int LUACALL wxLua_wxLuaDebugServer_StartServerThread(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StartServerThread returns = self->StartServerThread(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebugServer_AddBreakPoint(lua_State *L) { wxLuaState wxlState(L); bool returns; // int lineNumber int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call AddBreakPoint returns = self->AddBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); return 1; } // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebugServer_RemoveBreakPoint(lua_State *L) { wxLuaState wxlState(L); bool returns; // int lineNumber int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call RemoveBreakPoint returns = self->RemoveBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); return 1; } // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebugServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call ClearAllBreakPoints returns = self->ClearAllBreakPoints(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebugServer_Run(lua_State *L) { wxLuaState wxlState(L); bool returns; // const wxString fileName const wxString fileName = lua2wx(wxlState.GetStringType(3)); // const wxString file const wxString file = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Run returns = self->Run(file, fileName); // push the result flag lua_pushboolean(L, returns); return 1; } // bool Step() static int LUACALL wxLua_wxLuaDebugServer_Step(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Step returns = self->Step(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool StepOver() static int LUACALL wxLua_wxLuaDebugServer_StepOver(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StepOver returns = self->StepOver(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool StepOut() static int LUACALL wxLua_wxLuaDebugServer_StepOut(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StepOut returns = self->StepOut(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool Continue() static int LUACALL wxLua_wxLuaDebugServer_Continue(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Continue returns = self->Continue(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool Break() static int LUACALL wxLua_wxLuaDebugServer_Break(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Break returns = self->Break(); // push the result flag lua_pushboolean(L, returns); return 1; } // bool Reset() static int LUACALL wxLua_wxLuaDebugServer_Reset(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Reset returns = self->Reset(); // push the result flag lua_pushboolean(L, returns); return 1; } // void DisplayStackDialog(wxWindow *pParent) static int LUACALL wxLua_wxLuaDebugServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call DisplayStackDialog self->DisplayStackDialog(pParent); return 0; } // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebugServer_EvaluateExpr(lua_State *L) { wxLuaState wxlState(L); bool returns; // const wxString expr const wxString expr = lua2wx(wxlState.GetStringType(3)); // int exprRef int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call EvaluateExpr returns = self->EvaluateExpr(exprRef, expr); // push the result flag lua_pushboolean(L, returns); return 1; } static int LUACALL wxLua_wxLuaDebugServer_destructor(lua_State *L) { wxLuaState wxlState(L); wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // remove from tracked memory list if (self != 0) wxlState.RemoveTrackedMemory(self); return 0; } static int LUACALL wxLua_wxLuaDebugServer_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // remove from tracked memory list if (self != 0) if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxLuaDebugServer_methods[] = { { LuaConstructor, "wxLuaDebugServer", wxLua_wxLuaDebugServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaConstructor, "wxLuaDebugServerCompile", wxLua_wxLuaDebugServerCompile_constructor, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "StartClient", wxLua_wxLuaDebugServer_StartClient, 0, 0, { 0 } }, { LuaMethod, "StartServerThread", wxLua_wxLuaDebugServer_StartServerThread, 0, 0, { 0 } }, { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebugServer_AddBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebugServer_RemoveBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebugServer_ClearAllBreakPoints, 0, 0, { 0 } }, { LuaMethod, "Run", wxLua_wxLuaDebugServer_Run, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "Step", wxLua_wxLuaDebugServer_Step, 0, 0, { 0 } }, { LuaMethod, "StepOver", wxLua_wxLuaDebugServer_StepOver, 0, 0, { 0 } }, { LuaMethod, "StepOut", wxLua_wxLuaDebugServer_StepOut, 0, 0, { 0 } }, { LuaMethod, "Continue", wxLua_wxLuaDebugServer_Continue, 0, 0, { 0 } }, { LuaMethod, "Break", wxLua_wxLuaDebugServer_Break, 0, 0, { 0 } }, { LuaMethod, "Reset", wxLua_wxLuaDebugServer_Reset, 0, 0, { 0 } }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebugServer_DisplayStackDialog, 1, 1, { &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebugServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaDelete, "wxLuaDebugServer", wxLua_wxLuaDebugServer_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaDebugServer_Delete, 0, 0, {0} }, }; // Extern accessor to class method map WXLUAMETHOD* wxLuaDebugServer_methods = s_wxLuaDebugServer_methods; int wxLuaDebugServer_methodCount = sizeof(s_wxLuaDebugServer_methods)/sizeof(s_wxLuaDebugServer_methods[0]); // ------------------------------------------------------------------------------------------------- // Bind class wxLuaDebugData // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxLuaDebugData = -1; static int LUACALL wxLua_wxLuaDebugData_destructor(lua_State *) { return 0; } // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxLuaDebugData_methods[] = { { LuaDelete, "wxLuaDebugData", wxLua_wxLuaDebugData_destructor, 0, 0, {0} }, }; // Extern accessor to class method map WXLUAMETHOD* wxLuaDebugData_methods = s_wxLuaDebugData_methods; int wxLuaDebugData_methodCount = sizeof(s_wxLuaDebugData_methods)/sizeof(s_wxLuaDebugData_methods[0]); // ------------------------------------------------------------------------------------------------- // Bind class wxLuaDebugEvent // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxLuaDebugEvent = -1; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebugEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); int returns; // get this wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetLineNumber returns = self->GetLineNumber(); // push the result number lua_pushnumber(L, returns); return 1; } // int GetReference() const static int LUACALL wxLua_wxLuaDebugEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); int returns; // get this wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetReference returns = self->GetReference(); // push the result number lua_pushnumber(L, returns); return 1; } // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebugEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); wxString returns; // get this wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetFileName returns = self->GetFileName(); // push the result string lua_pushstring(L, wx2lua(returns) ); return 1; } // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebugEvent_GetMessage(lua_State *L) { wxLuaState wxlState(L); wxString returns; // get this wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetMessage returns = self->GetMessage(); // push the result string lua_pushstring(L, wx2lua(returns) ); return 1; } // const wxLuaDebugData *GetDebugData() const static int LUACALL wxLua_wxLuaDebugEvent_GetDebugData(lua_State *L) { wxLuaState wxlState(L); const wxLuaDebugData *returns; // get this wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetDebugData returns = self->GetDebugData(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxLuaDebugData, returns); return 1; } static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *L) { wxLuaState wxlState(L); wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // remove from tracked memory list if (self != 0) wxlState.RemoveTrackedMemory(self); return 0; } static int LUACALL wxLua_wxLuaDebugEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // remove from tracked memory list if (self != 0) if (wxlState.RemoveTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxLuaDebugEvent_methods[] = { { LuaMethod, "GetLineNumber", wxLua_wxLuaDebugEvent_GetLineNumber, 0, 0, { 0 } }, { LuaMethod, "GetReference", wxLua_wxLuaDebugEvent_GetReference, 0, 0, { 0 } }, { LuaMethod, "GetFileName", wxLua_wxLuaDebugEvent_GetFileName, 0, 0, { 0 } }, { LuaMethod, "GetMessage", wxLua_wxLuaDebugEvent_GetMessage, 0, 0, { 0 } }, { LuaMethod, "GetDebugData", wxLua_wxLuaDebugEvent_GetDebugData, 0, 0, { 0 } }, { LuaDelete, "wxLuaDebugEvent", wxLua_wxLuaDebugEvent_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxLuaDebugEvent_Delete, 0, 0, {0} }, }; // Extern accessor to class method map WXLUAMETHOD* wxLuaDebugEvent_methods = s_wxLuaDebugEvent_methods; int wxLuaDebugEvent_methodCount = sizeof(s_wxLuaDebugEvent_methods)/sizeof(s_wxLuaDebugEvent_methods[0]); |
|
From: John L. <jr...@us...> - 2006-05-24 04:53:55
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6138/wxLua/modules/wxluasocket/include Added Files: wxluasocket_bind.h Log Message: added wxluasocket bindings to go into modules/wxluasocket instead of wxwidgets bindings --- NEW FILE: wxluasocket_bind.h --- // ---------------------------------------------------------------------------- // wxluasocket.h - headers and tags for wxLua binding // // This file was generated by genwxbind.lua // Any changes made to this file may be lost when file is regenerated // ---------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wxluasocket_H__ #define __HOOK_WXLUA_wxluasocket_H__ #include "wxlua/include/internal.h" #include "wx/defs.h" #include "wxluasocket/include/wxluasocketdefs.h" #include "wxbind/include/wxbind.h" #include "wxluasocket/include/wxluasocket_bind.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 #endif #ifndef wxUSE_SOUND #define wxUSE_SOUND 0 #endif // binding class class wxLuaBinding_wxluasocket : public wxLuaBinding { public: wxLuaBinding_wxluasocket(); virtual wxLuaBinding* Clone() const { return new wxLuaBinding_wxluasocket; } protected: virtual void PreRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable); virtual void PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable); DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxluasocket) }; // bind wxLuaBinding_wxluasocket to a single wxLuaState extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluasocket for all wxLuaStates extern WXDLLIMPEXP_WXLUASOCKET bool wxLuaBinding_wxluasocket_init(); #include "wx/defs.h" #include "wx/object.h" #include "wxlua/include/wxlbind.h" #include "wxlua/include/wxlstate.h" #include "wxluasocket/include/wxldserv.h" // Lua Tag Method Values for each Class extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugData; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugEvent; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugServer; // Method Table extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugData_methods; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugData_methodCount; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugEvent_methods; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugEvent_methodCount; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugServer_methods; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugServer_methodCount; #endif // __HOOK_WXLUA_wxluasocket_H__ |
|
From: John L. <jr...@us...> - 2006-05-24 04:53:55
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6138/wxLua/bindings/wxluasocket Added Files: wxluasocket.i wxluasocket_rules.lua Log Message: added wxluasocket bindings to go into modules/wxluasocket instead of wxwidgets bindings --- NEW FILE: wxluasocket_rules.lua --- ------------------------------------------------------------------------------- -- Rules to build wxWidgets' wxStyledTextCtrl binding for wxLua -- load using : $lua -e"rulesFilename=\"rules.lua\"" genwxbind.lua ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" --============================================================================= -- Set the lua namespace (lua table) that the bindings will be placed into. -- eg. wx.wxWindow(...) hook_lua_namespace = "wx" -- Set the C++ "namespace" that the bindings will be placed. -- eg. cpp function names contain this to prevent duplicate function names hook_cpp_namespace = "wxluasocket" --============================================================================= -- Set the directory to output the bindings to, both C++ header and source files output_cpp_header_filepath = wxlua_dir.."modules/wxluasocket/include" output_cpp_filepath = wxlua_dir.."modules/wxluasocket/src" output_cpp_impexpsymbol = "WXDLLIMPEXP_WXLUASOCKET" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUASOCKET" ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_cpp_header_filename" in -- the C++ wrapper files, so it must include the proper #include path. hook_cpp_header_filename = "wxluasocket/include/wxluasocket_bind.h" ------------------------------------------------------------------------------- -- Set the name of the main binding file that will have the glue code for the -- bindings in it. This file along with the output from the *.i files will be -- placed in the "output_cpp_filepath". hook_cpp_binding_filename = hook_cpp_namespace.."_bind.cpp" ------------------------------------------------------------------------------- -- Set the name of the subclassed wxLuaBinding class hook_cpp_binding_classname = "wxLuaBinding_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- Set the function names that wrap the output structs of defined values, -- objects, events, functions, and classes. hook_cpp_define_funcname = "wxLuaGetDefineList_"..hook_cpp_namespace hook_cpp_string_funcname = "wxLuaGetStringList_"..hook_cpp_namespace hook_cpp_object_funcname = "wxLuaGetObjectList_"..hook_cpp_namespace hook_cpp_event_funcname = "wxLuaGetEventList_"..hook_cpp_namespace hook_cpp_function_funcname = "wxLuaGetFunctionList_"..hook_cpp_namespace hook_cpp_class_funcname = "wxLuaGetClassList_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated cpp file or "" for none hook_cpp_binding_includes = "#include \"wx/wxprec.h\"\n" ------------------------------------------------------------------------------- -- Add additional include information or C++ code for the binding header file. -- This code will be place directly after any #includes at the top of the file hook_cpp_binding_header_includes = "#include \"wx/defs.h\"\n".. "#include \"wxluasocket/include/wxluasocketdefs.h\"\n".. "#include \"wxbind/include/wxbind.h\"\n".. "#include \"wxluasocket/include/wxluasocket_bind.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" ------------------------------------------------------------------------------- -- Set any #includes or other C++ code to be placed verbatim at the top of -- the single hook_cpp_binding_filename generated cpp file or "" for none hook_cpp_binding_source_includes = "" --============================================================================= -- Set the bindings directory that contains the *.i interface files interface_filepath = wxlua_dir.."bindings/wxluasocket" ------------------------------------------------------------------------------- -- A list of interface files to use to make the bindings. These files will be -- converted into *.cpp and placed in the output_cpp_filepath directory. -- The files are loaded from the interface_filepath. interface_fileTable = { "wxluasocket.i" } ------------------------------------------------------------------------------- -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } --============================================================================= -- A table containing filenames of XXX_datatype.lua from other wrappers to -- to define classes and data types used in this wrapper -- NOTE: for the base wxWidgets wrappers we don't load the cache since they -- don't depend on other wrappers and can cause problems when interface -- files are updated. Make sure you delete or have updated any cache file -- that changes any data types used by this binding. datatype_cache_input_fileTable = { wxlua_dir.."bindings/wxwidgets/wx_datatypes.lua" } ------------------------------------------------------------------------------- -- The file to output the data type cache for later use with a binding that -- makes use of data types (classes, enums, etc) that are declared in this -- binding. The file will be generated in the interface_filepath. datatypes_cache_output_filename = hook_cpp_namespace.."_datatypes.lua" --============================================================================= -- virtual void wxLuaBinding::PreRegister function body for the -- hook_cpp_binding_classname. You can initialize data here. -- Typically this is not necessary and you can rem this out. -- wxLuaBinding_PreRegister = nothing to do here --============================================================================= -- virtual void wxLuaBinding::PostRegister function body for the -- hook_cpp_binding_classname. You can load any other custom bindings here. -- Typically this is not necessary and you can rem this out. -- wxLuaBinding_PostRegister = nothing to do here --============================================================================= -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ------------------------------------------------------------------------------- -- Add additional data types here -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false) --============================================================================= -- Generate comments into binding C++ code comment_cpp_binding_code = true --- NEW FILE: wxluasocket.i --- // ============================================================================ // Purpose: wxLuaSocket specific wrappers // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 // ============================================================================ //----------------------------------------------------------------------------- // wxLuaDebugServer %include "wx/defs.h" %include "wx/object.h" %include "wxlua/include/wxlstate.h" %include "wxlua/include/wxlbind.h" %include "wxluasocket/include/wxldserv.h" %class %delete %noclassinfo wxLuaDebugServer wxLuaDebugServer(int portNumber) %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) bool StartClient() bool StartServerThread() bool AddBreakPoint(const wxString &fileName, int lineNumber) bool RemoveBreakPoint(const wxString &fileName, int lineNumber) bool ClearAllBreakPoints() bool Run(const wxString &file, const wxString &fileName) bool Step() bool StepOver() bool StepOut() bool Continue() bool Break() bool Reset() void DisplayStackDialog(wxWindow *pParent) bool EvaluateExpr(int exprRef, const wxString &expr) %endclass //----------------------------------------------------------------------------- // wxLuaDebugData %class %noclassinfo wxLuaDebugData %endclass //----------------------------------------------------------------------------- // wxLuaDebugEvent %class %delete wxLuaDebugEvent, wxEvent %define %event wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED %define %event wxEVT_WXLUA_DEBUG_BREAK %define %event wxEVT_WXLUA_DEBUG_PRINT %define %event wxEVT_WXLUA_DEBUG_ERROR %define %event wxEVT_WXLUA_DEBUG_EXIT %define %event wxEVT_WXLUA_DEBUG_STACK_ENUM %define %event wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM %define %event wxEVT_WXLUA_DEBUG_TABLE_ENUM %define %event wxEVT_WXLUA_DEBUG_EVALUATE_EXPR int GetLineNumber() const int GetReference() const wxString GetFileName() const wxString GetMessage() const const wxLuaDebugData *GetDebugData() const %endclass |
|
From: John L. <jr...@us...> - 2006-05-24 04:53:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5875/wxluasocket Log Message: Directory /cvsroot/wxlua/wxLua/bindings/wxluasocket added to the repository |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:32
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxlua.cpp 15 May 2006 04:48:37 -0000 1.31 --- wxlua.cpp 24 May 2006 04:49:59 -0000 1.32 *************** *** 46,49 **** --- 46,50 ---- extern bool wxLuaBinding_wx_init(); extern bool wxLuaBinding_wxstc_init(); + extern bool wxLuaBinding_wxluasocket_init(); // --------------------------------------------------------------------------- *************** *** 191,194 **** --- 192,196 ---- wxLuaBinding_wx_init(); wxLuaBinding_wxstc_init(); + wxLuaBinding_wxluasocket_init(); m_wxlState = wxLuaState(this, -1); |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:16
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluasetup.h 20 May 2006 14:00:48 -0000 1.6 --- wxluasetup.h 24 May 2006 04:50:01 -0000 1.7 *************** *** 66,70 **** #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 - #define wxLUA_USE_wxLuaDebugServer 0 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 --- 66,69 ---- *************** *** 102,106 **** #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 - #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 0 --- 101,104 ---- |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/bindings/wxstc Modified Files: stc.i wxstc_datatypes.lua wxstc_rules.lua Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxstc_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_rules.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxstc_rules.lua 20 May 2006 19:40:19 -0000 1.14 --- wxstc_rules.lua 24 May 2006 04:50:00 -0000 1.15 *************** *** 61,65 **** hook_cpp_binding_header_includes = "#include \"wx/defs.h\"\n".. ! "#include \"wxbindstc/include/wxbind.h\"\n".. "#include \"wxbindstc/include/wxbindstcdefs.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. --- 61,65 ---- hook_cpp_binding_header_includes = "#include \"wx/defs.h\"\n".. ! "#include \"wxbind/include/wxbind.h\"\n".. "#include \"wxbindstc/include/wxbindstcdefs.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stc.i 4 Mar 2006 22:35:33 -0000 1.3 --- stc.i 24 May 2006 04:50:00 -0000 1.4 *************** *** 7,12 **** ///////////////////////////////////////////////////////////////////////////// - %if wxLUA_USE_wxStyledTextCtrl - %include "wx/stc/stc.h" --- 7,10 ---- *************** *** 1079,1081 **** %endclass - %endif wxLUA_USE_wxStyledTextCtrl --- 1077,1078 ---- Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxstc_datatypes.lua 20 May 2006 18:09:01 -0000 1.27 --- wxstc_datatypes.lua 24 May 2006 04:50:00 -0000 1.28 *************** *** 1718,1740 **** Name = "wxLog", }, - wxLuaDebugData = { - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugData", - }, - wxLuaDebugEvent = { - BaseClass = "wxEvent", - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugEvent", - }, - wxLuaDebugServer = { - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugServer", - }, wxLuaHtmlWinTagEvent = { BaseClass = "wxEvent", --- 1718,1721 ---- *************** *** 2633,2637 **** wxStyledTextCtrl = { BaseClass = "wxControl", - Condition = "wxLUA_USE_wxStyledTextCtrl", DefType = "class", Intrinsic = false, --- 2614,2617 ---- *************** *** 2640,2644 **** wxStyledTextEvent = { BaseClass = "wxCommandEvent", - Condition = "wxLUA_USE_wxStyledTextCtrl", DefType = "class", Intrinsic = false, --- 2620,2623 ---- *************** *** 3267,3271 **** wxLUA_USE_wxListBox = "wxLUA_USE_wxListBox", wxLUA_USE_wxListCtrl = "wxLUA_USE_wxListCtrl", - wxLUA_USE_wxLuaDebugServer = "wxLUA_USE_wxLuaDebugServer", wxLUA_USE_wxLuaHtmlWindow = "wxLUA_USE_wxLuaHtmlWindow", wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", --- 3246,3249 ---- *************** *** 3303,3307 **** wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", - wxLUA_USE_wxStyledTextCtrl = "wxLUA_USE_wxStyledTextCtrl", wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings", wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl", --- 3281,3284 ---- |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/bindings/wxwidgets Modified Files: data.i override.hpp wx_datatypes.lua wxlua.i Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wx_datatypes.lua 18 May 2006 05:47:39 -0000 1.31 --- wx_datatypes.lua 24 May 2006 04:50:00 -0000 1.32 *************** *** 1718,1740 **** Name = "wxLog", }, - wxLuaDebugData = { - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugData", - }, - wxLuaDebugEvent = { - BaseClass = "wxEvent", - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugEvent", - }, - wxLuaDebugServer = { - Condition = "wxLUA_USE_wxLuaDebugServer", - DefType = "class", - Intrinsic = false, - Name = "wxLuaDebugServer", - }, wxLuaHtmlWinTagEvent = { BaseClass = "wxEvent", --- 1718,1721 ---- *************** *** 3254,3258 **** wxLUA_USE_wxListBox = "wxLUA_USE_wxListBox", wxLUA_USE_wxListCtrl = "wxLUA_USE_wxListCtrl", - wxLUA_USE_wxLuaDebugServer = "wxLUA_USE_wxLuaDebugServer", wxLUA_USE_wxLuaHtmlWindow = "wxLUA_USE_wxLuaHtmlWindow", wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", --- 3235,3238 ---- *************** *** 3290,3294 **** wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", - wxLUA_USE_wxStyledTextCtrl = "wxLUA_USE_wxStyledTextCtrl", wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings", wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl", --- 3270,3273 ---- Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlua.i 17 May 2006 05:02:05 -0000 1.15 --- wxlua.i 24 May 2006 04:50:00 -0000 1.16 *************** *** 33,92 **** //----------------------------------------------------------------------------- - // wxLuaDebugServer - - %if wxLUA_USE_wxLuaDebugServer - - %include "wxluasocket/include/wxldserv.h" - - %class %delete %noclassinfo wxLuaDebugServer - wxLuaDebugServer(int portNumber) - %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) - - bool StartClient() - bool StartServerThread() - bool AddBreakPoint(const wxString &fileName, int lineNumber) - bool RemoveBreakPoint(const wxString &fileName, int lineNumber) - bool ClearAllBreakPoints() - bool Run(const wxString &file, const wxString &fileName) - bool Step() - bool StepOver() - bool StepOut() - bool Continue() - bool Break() - bool Reset() - void DisplayStackDialog(wxWindow *pParent) - bool EvaluateExpr(int exprRef, const wxString &expr) - %endclass - - //----------------------------------------------------------------------------- - // wxLuaDebugData - - %class %noclassinfo wxLuaDebugData - %endclass - - //----------------------------------------------------------------------------- - // wxLuaDebugEvent - - %class %delete wxLuaDebugEvent, wxEvent - %define %event wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED - %define %event wxEVT_WXLUA_DEBUG_BREAK - %define %event wxEVT_WXLUA_DEBUG_PRINT - %define %event wxEVT_WXLUA_DEBUG_ERROR - %define %event wxEVT_WXLUA_DEBUG_EXIT - %define %event wxEVT_WXLUA_DEBUG_STACK_ENUM - %define %event wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM - %define %event wxEVT_WXLUA_DEBUG_TABLE_ENUM - %define %event wxEVT_WXLUA_DEBUG_EVALUATE_EXPR - - int GetLineNumber() const - int GetReference() const - wxString GetFileName() const - wxString GetMessage() const - const wxLuaDebugData *GetDebugData() const - %endclass - - %endif wxLUA_USE_wxLuaDebugServer - - //----------------------------------------------------------------------------- // wxLuaPrintout --- 33,36 ---- Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** override.hpp 18 May 2006 05:47:39 -0000 1.41 --- override.hpp 24 May 2006 04:50:00 -0000 1.42 *************** *** 974,977 **** --- 974,998 ---- // ---------------------------------------------------------------------------- + %override wxLua_wxString_constructor + // wxString(const wxString& str = "") + static int LUACALL wxLua_wxString_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxString* returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString str = "" + const wxString str = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxEmptyString)); + // call constructor + returns = new wxString(str); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxString, returns); + + return 1; + } + %end + %override wxLua_wxClassInfo_constructor // wxClassInfo(const wxString &name) *************** *** 4236,4257 **** %end - %override wxLua_wxLuaDebugServerCompile_constructor - // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) - static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString &fileName - wxString fileName = lua2wx(wxlState.GetStringType(2)); - // const wxString &buffer - wxString buffer = lua2wx(wxlState.GetStringType(1)); - // compile the file - bool fResult = wxLuaDebugServer::Compile(buffer, fileName); - // push result - lua_pushboolean(L, fResult); - // return the number of parameters - return 1; - } - %end - %override wxLua_wxLuaPrintout_constructor // wxLuaPrintout(const wxString& title = "Printout", wxLuaObject *pObject = NULL) --- 4257,4260 ---- Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** data.i 18 May 2006 05:47:39 -0000 1.15 --- data.i 24 May 2006 04:50:00 -0000 1.16 *************** *** 9,12 **** --- 9,22 ---- //----------------------------------------------------------------------------- + // wxString - a stub class for people who need wxString (wxLua uses lua strings) + + %class %noclassinfo %encapsulate wxString + wxString(const wxString& str = "") + + wxString GetData() const + + %endclass + + //----------------------------------------------------------------------------- // wxClientData |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 13 May 2006 21:05:36 -0000 1.7 --- Makefile 24 May 2006 04:50:02 -0000 1.8 *************** *** 35,39 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) --- 35,39 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I../../wxbind/setup -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) *************** *** 57,60 **** --- 57,61 ---- ../include/wxlsock.h \ ../include/wxlhandl.h \ + ../include/wxluasocket.h \ ../include/dservice.h *************** *** 65,68 **** --- 66,71 ---- wxlsock.cpp \ wxlhandl.cpp \ + wxluasocket.cpp \ + wxluasocket_bind.cpp \ dservice.cpp |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxbind.h 20 May 2006 19:40:19 -0000 1.29 --- wxbind.h 24 May 2006 04:50:00 -0000 1.30 *************** *** 446,454 **** - #if wxLUA_USE_wxLuaDebugServer - #include "wxluasocket/include/wxldserv.h" - #endif - - #if wxLUA_USE_wxLuaHtmlWindow #include "wxbind/include/wxlhtmlwin.h" --- 446,449 ---- *************** *** 875,878 **** --- 870,874 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSetCursorEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizeEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxString; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStringClientData; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSysColourChangedEvent; *************** *** 1261,1271 **** - #if wxLUA_USE_wxLuaDebugServer - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugData; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugEvent; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaDebugServer; - #endif - - #if wxLUA_USE_wxLuaHtmlWindow extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaHtmlWinTagEvent; --- 1257,1260 ---- *************** *** 1858,1861 **** --- 1847,1852 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSizeEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizeEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxString_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxString_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStringClientData_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStringClientData_methodCount; *************** *** 2397,2410 **** - #if wxLUA_USE_wxLuaDebugServer - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugData_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugData_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugEvent_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugEvent_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaDebugServer_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLuaDebugServer_methodCount; - #endif - - #if wxLUA_USE_wxLuaHtmlWindow extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods; --- 2388,2391 ---- *************** *** 2834,2837 **** --- 2815,2819 ---- wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxProcess) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler) |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxlbind.cpp 18 May 2006 05:47:40 -0000 1.34 --- wxlbind.cpp 24 May 2006 04:50:02 -0000 1.35 *************** *** 279,283 **** m_startTag(0), m_lastTag(0), ! m_wxLuaTable(0) { } --- 279,283 ---- m_startTag(0), m_lastTag(0), ! m_wxLuaTable(-1) { } *************** *** 357,373 **** tableOffset = lua_gettop(L); ! // find the m_wxLuaTable of the previously loaded binding ! wxLuaBindingList::Node *node; ! for (node = wxLuaBinding::GetBindingList()->GetFirst(); node; node = node->GetNext() ) { wxLuaBinding* binding = node->GetData(); - wxCHECK_MSG(binding != this, 0, wxT("Invalid binding order?")); ! if (binding->GetLuaNamespace() == m_nameSpace) { ! m_wxLuaTable = binding->m_wxLuaTable; ! break; } } } --- 357,377 ---- tableOffset = lua_gettop(L); ! // remember the last good binding with the same namespace ! wxLuaBinding* namedBinding = NULL; ! ! // find the m_wxLuaTable of the previously loaded binding (start at last) ! wxLuaBindingList::Node *node = wxlState.GetLuaBindingList()->GetFirst(); ! for (; node; node = node->GetNext()) { wxLuaBinding* binding = node->GetData(); ! if ((binding->GetLuaNamespace() == m_nameSpace) && (binding->m_wxLuaTable >= 0)) { ! namedBinding = binding; } } + + if (namedBinding) + m_wxLuaTable = namedBinding->m_wxLuaTable; } |
|
From: John L. <jr...@us...> - 2006-05-24 04:50:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4440/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: move the wxLuaDebugSocket bindings to their own dir and out of wxWidgets bindings fix using more than two bindings with same namespace Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxstc_bind.cpp 26 Apr 2006 22:54:15 -0000 1.7 --- wxstc_bind.cpp 24 May 2006 04:50:01 -0000 1.8 *************** *** 32,41 **** { ! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxStyledTextCtrl) { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, #endif - - #if wxLUA_USE_wxStyledTextCtrl { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CHARADDED, "wxEVT_STC_CHARADDED", &s_wxluatag_wxStyledTextEvent }, --- 32,39 ---- { ! #if !wxCHECK_VERSION(2,5,0) { &wxEVT_STC_POSCHANGED, "wxEVT_STC_POSCHANGED", &s_wxluatag_wxStyledTextEvent }, #endif { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CHARADDED, "wxEVT_STC_CHARADDED", &s_wxluatag_wxStyledTextEvent }, *************** *** 60,65 **** { &wxEVT_STC_USERLISTSELECTION, "wxEVT_STC_USERLISTSELECTION", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_ZOOM, "wxEVT_STC_ZOOM", &s_wxluatag_wxStyledTextEvent }, - #endif - { 0, 0, 0 }, }; --- 58,61 ---- *************** *** 80,84 **** // -------------------------------------------------------------------- ! #if (!wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxStyledTextCtrl) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, --- 76,80 ---- // -------------------------------------------------------------------- ! #if !wxCHECK_VERSION(2,5,0) { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, { "wxSTC_SCRIPTOL_COMMENT", wxSTC_SCRIPTOL_COMMENT }, *************** *** 102,127 **** #endif - - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxStyledTextCtrl) - { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, - { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, - { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, - { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, - { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, - { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, - { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, - { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, - { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, - { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, - { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, - { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, - { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, - { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, - { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, - { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, - #endif - - - #if wxLUA_USE_wxStyledTextCtrl { "wxSTC_ADA_CHARACTER", wxSTC_ADA_CHARACTER }, { "wxSTC_ADA_DEFAULT", wxSTC_ADA_DEFAULT }, --- 98,101 ---- *************** *** 685,688 **** --- 659,680 ---- { "wxSTC_WS_VISIBLEAFTERINDENT", wxSTC_WS_VISIBLEAFTERINDENT }, { "wxSTC_WS_VISIBLEALWAYS", wxSTC_WS_VISIBLEALWAYS }, + + #if wxCHECK_VERSION(2,5,0) + { "wxSTC_SCRIPTOL_CHARACTER", wxSTC_SCRIPTOL_CHARACTER }, + { "wxSTC_SCRIPTOL_CLASSNAME", wxSTC_SCRIPTOL_CLASSNAME }, + { "wxSTC_SCRIPTOL_COMMENTBLOCK", wxSTC_SCRIPTOL_COMMENTBLOCK }, + { "wxSTC_SCRIPTOL_COMMENTLINE", wxSTC_SCRIPTOL_COMMENTLINE }, + { "wxSTC_SCRIPTOL_CSTYLE", wxSTC_SCRIPTOL_CSTYLE }, + { "wxSTC_SCRIPTOL_DEFAULT", wxSTC_SCRIPTOL_DEFAULT }, + { "wxSTC_SCRIPTOL_IDENTIFIER", wxSTC_SCRIPTOL_IDENTIFIER }, + { "wxSTC_SCRIPTOL_KEYWORD", wxSTC_SCRIPTOL_KEYWORD }, + { "wxSTC_SCRIPTOL_NUMBER", wxSTC_SCRIPTOL_NUMBER }, + { "wxSTC_SCRIPTOL_OPERATOR", wxSTC_SCRIPTOL_OPERATOR }, + { "wxSTC_SCRIPTOL_PERSISTENT", wxSTC_SCRIPTOL_PERSISTENT }, + { "wxSTC_SCRIPTOL_PREPROCESSOR", wxSTC_SCRIPTOL_PREPROCESSOR }, + { "wxSTC_SCRIPTOL_STRING", wxSTC_SCRIPTOL_STRING }, + { "wxSTC_SCRIPTOL_STRINGEOL", wxSTC_SCRIPTOL_STRINGEOL }, + { "wxSTC_SCRIPTOL_TRIPLE", wxSTC_SCRIPTOL_TRIPLE }, + { "wxSTC_SCRIPTOL_WHITE", wxSTC_SCRIPTOL_WHITE }, #endif *************** *** 742,745 **** --- 734,753 ---- } + + + WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count) + { + static WXLUACLASS classList[] = + { + { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, -1, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl" }, + { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, -1, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent" }, + { 0, 0, 0, 0, 0, 0, 0 }, + }; + count = (sizeof(classList)/sizeof(classList[0])) - 1; + + return classList; + } + + // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxstc() is called to register classes *************** *** 812,830 **** - - WXLUACLASS* wxLuaGetClassList_wxstc(size_t &count) - { - static WXLUACLASS classList[] = - { - - #if wxLUA_USE_wxStyledTextCtrl - { "wxStyledTextCtrl", wxStyledTextCtrl_methods, wxStyledTextCtrl_methodCount, -1, CLASSINFO(wxStyledTextCtrl), &s_wxluatag_wxStyledTextCtrl, "wxControl" }, - { "wxStyledTextEvent", wxStyledTextEvent_methods, wxStyledTextEvent_methodCount, -1, CLASSINFO(wxStyledTextEvent), &s_wxluatag_wxStyledTextEvent, "wxCommandEvent" }, - #endif - - { 0, 0, 0, 0, 0, 0, 0 }, - }; - count = (sizeof(classList)/sizeof(classList[0])) - 1; - - return classList; - } --- 820,821 ---- Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** stc.cpp 3 May 2006 22:52:18 -0000 1.12 --- stc.cpp 24 May 2006 04:50:01 -0000 1.13 *************** *** 23,28 **** - - #if wxLUA_USE_wxStyledTextCtrl // ------------------------------------------------------------------------------------------------- // Bind class wxStyledTextCtrl --- 23,26 ---- *************** *** 33,37 **** [...1268 lines suppressed...] --- 5918,5929 ---- { LuaDelete, "wxStyledTextEvent", wxLua_wxStyledTextEvent_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxStyledTextEvent_Delete, 0, 0, {0} }, + + #if wxLUA_USE_wxDragDrop + { LuaMethod, "SetDragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "GetDragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, { 0 } }, + { LuaGetProp, "DragResult", wxLua_wxStyledTextEvent_GetDragResult, 0, 0, {0} }, + { LuaSetProp, "DragResult", wxLua_wxStyledTextEvent_SetDragResult, 1, 1, {0} }, + #endif + }; *************** *** 5936,5939 **** WXLUAMETHOD* wxStyledTextEvent_methods = s_wxStyledTextEvent_methods; int wxStyledTextEvent_methodCount = sizeof(s_wxStyledTextEvent_methods)/sizeof(s_wxStyledTextEvent_methods[0]); - #endif --- 5931,5933 ---- |
