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-21 09:55:30
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16722/modules Modified Files: Makefile.in Log Message: updated DSW/DSP for SHARED build changes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Makefile.in 20 May 2006 20:17:56 -0000 1.40 --- Makefile.in 21 May 2006 09:55:24 -0000 1.41 *************** *** 1032,1036 **** @COND_SHARED_0_USE_WXBINDSTC_1@install_wxbindstc_lib_headers: @COND_SHARED_0_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h; do \ @COND_SHARED_0_USE_WXBINDSTC_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1032,1036 ---- @COND_SHARED_0_USE_WXBINDSTC_1@install_wxbindstc_lib_headers: @COND_SHARED_0_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h wxbindstc/include/wxbindstcdefs.h; do \ @COND_SHARED_0_USE_WXBINDSTC_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1040,1044 **** @COND_SHARED_0_USE_WXBINDSTC_1@uninstall_wxbindstc_lib_headers: ! @COND_SHARED_0_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h; do \ @COND_SHARED_0_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXBINDSTC_1@ done --- 1040,1044 ---- @COND_SHARED_0_USE_WXBINDSTC_1@uninstall_wxbindstc_lib_headers: ! @COND_SHARED_0_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h wxbindstc/include/wxbindstcdefs.h; do \ @COND_SHARED_0_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXBINDSTC_1@ done *************** *** 1061,1065 **** @COND_SHARED_1_USE_WXBINDSTC_1@install_wxbindstc_dll_headers: @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h; do \ @COND_SHARED_1_USE_WXBINDSTC_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1061,1065 ---- @COND_SHARED_1_USE_WXBINDSTC_1@install_wxbindstc_dll_headers: @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h wxbindstc/include/wxbindstcdefs.h; do \ @COND_SHARED_1_USE_WXBINDSTC_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXBINDSTC_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1069,1073 **** @COND_SHARED_1_USE_WXBINDSTC_1@uninstall_wxbindstc_dll_headers: ! @COND_SHARED_1_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h; do \ @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXBINDSTC_1@ done --- 1069,1073 ---- @COND_SHARED_1_USE_WXBINDSTC_1@uninstall_wxbindstc_dll_headers: ! @COND_SHARED_1_USE_WXBINDSTC_1@ for f in wxbindstc/include/wxbind.h wxbindstc/include/wxbindstcdefs.h; do \ @COND_SHARED_1_USE_WXBINDSTC_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXBINDSTC_1@ done *************** *** 1087,1091 **** @COND_SHARED_0_USE_WXLUADEBUG_1@install_wxluadebug_lib_headers: @COND_SHARED_0_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h; do \ @COND_SHARED_0_USE_WXLUADEBUG_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1087,1091 ---- @COND_SHARED_0_USE_WXLUADEBUG_1@install_wxluadebug_lib_headers: @COND_SHARED_0_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h wxluadebug/include/wxluadebugdefs.h; do \ @COND_SHARED_0_USE_WXLUADEBUG_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1095,1099 **** @COND_SHARED_0_USE_WXLUADEBUG_1@uninstall_wxluadebug_lib_headers: ! @COND_SHARED_0_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h; do \ @COND_SHARED_0_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUADEBUG_1@ done --- 1095,1099 ---- @COND_SHARED_0_USE_WXLUADEBUG_1@uninstall_wxluadebug_lib_headers: ! @COND_SHARED_0_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h wxluadebug/include/wxluadebugdefs.h; do \ @COND_SHARED_0_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUADEBUG_1@ done *************** *** 1116,1120 **** @COND_SHARED_1_USE_WXLUADEBUG_1@install_wxluadebug_dll_headers: @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h; do \ @COND_SHARED_1_USE_WXLUADEBUG_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1116,1120 ---- @COND_SHARED_1_USE_WXLUADEBUG_1@install_wxluadebug_dll_headers: @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h wxluadebug/include/wxluadebugdefs.h; do \ @COND_SHARED_1_USE_WXLUADEBUG_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1124,1128 **** @COND_SHARED_1_USE_WXLUADEBUG_1@uninstall_wxluadebug_dll_headers: ! @COND_SHARED_1_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h; do \ @COND_SHARED_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUADEBUG_1@ done --- 1124,1128 ---- @COND_SHARED_1_USE_WXLUADEBUG_1@uninstall_wxluadebug_dll_headers: ! @COND_SHARED_1_USE_WXLUADEBUG_1@ for f in wxluadebug/include/wxldebug.h wxluadebug/include/splttree.h wxluadebug/include/staktree.h wxluadebug/include/wxluadebugdefs.h; do \ @COND_SHARED_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUADEBUG_1@ done *************** *** 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/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`; \ --- 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`; \ *************** *** 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/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 --- 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 *************** *** 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/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`; \ --- 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`; \ *************** *** 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/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 --- 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 |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:45:17
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18958/docs Modified Files: changelog.txt Log Message: mentioned shared build fixes Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** changelog.txt 22 Apr 2006 22:45:01 -0000 1.10 --- changelog.txt 20 May 2006 20:45:14 -0000 1.11 *************** *** 6,9 **** --- 6,10 ---- -------------------------------------------------------------------- + - Switched from lua 5.0 to lua 5.1 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files - Fixed %member tag for bindings to work properly *************** *** 24,28 **** (previously they were ignored) - now the lua executable is called wxlua-lua to avoid conflicts ! with other installations of lua --- 25,34 ---- (previously they were ignored) - now the lua executable is called wxlua-lua to avoid conflicts ! with other installations of lua and a verbatim lua5.1 library and ! executable is created instead ! - updated wrapper generators and all build system for shared builds ! (under Windows) ! - added the new module "luamodule" which can be used to create a wx.dll/.so ! module to use with the require() function of lua with the verbatim interpreter |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:36:41
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15308/bin Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/bin/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 12 Feb 2006 17:01:11 -0000 1.2 --- .cvsignore 20 May 2006 20:36:35 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- *lua* bin2c* + *.dll \ No newline at end of file |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:35:54
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14947/bin Added Files: copydlls.bat Log Message: added simple util --- NEW FILE: copydlls.bat --- @echo off REM This little batch file can be used to copy REM the DLL in this folder, so that EXEs compiled REM against shared builds of wxLua can find them. REM Fix the directory name if you're using a different REM compiler (e.g. vc_dll -> bcc_dll) if "%1%" NEQ "" goto okay goto usage :okay echo Copying all DLLs from ..\lib\%1%_dll directory copy /Y ..\lib\%1%_dll\*.dll . goto end :usage echo Call this script with the name of the compiler you used echo to build the DLLs (vc,bcc,mingw)... goto end :end |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:22:30
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10298/samples Modified Files: luamodule.wx.lua Log Message: fixed cpath to make it work out-of-the-box Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luamodule.wx.lua 20 May 2006 12:18:47 -0000 1.1 --- luamodule.wx.lua 20 May 2006 20:22:24 -0000 1.2 *************** *** 10,19 **** ----------------------------------------------------------------------------- ! -- find the PATH where the "wx" module of wxLua has been installed (Unix-only) ! -- tmpfilename = os.tmpname() ! -- os.execute("pkg-config wxlua --variable=libdir >"..tmpfilename) ! -- for line in io.lines(tmpfilename) do package.cpath = line.."/lua/5.1/?.so" end ! ! package.cpath = ";;../lib/?.so;..\lib\?.dll" require("wx") --- 10,20 ---- ----------------------------------------------------------------------------- ! -- to make this sample script work out-of-the-box, we need to add ! -- to the paths looked by require() all possible locations of the ! -- wx.dll/.so module. ! -- Please also note that this sample can be executed only when ! -- wxLua has been compiled in shared mode (--enable-shared on Unix, ! -- SHARED=1 on Windows) ! package.cpath = ";;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;" require("wx") |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:18:05
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8475/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxlua.dsp Log Message: changed luamodule to link against verbatim lua and output result in DLL dir Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.vc 20 May 2006 18:22:26 -0000 1.45 --- makefile.vc 20 May 2006 20:17:57 -0000 1.46 *************** *** 237,242 **** $(____BUILD_42) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ --- 237,242 ---- $(____BUILD_42) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXLUA_LUA_NEWTHREAD /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ *************** *** 252,256 **** /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXMAKINGDLL_WXLUA /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ --- 252,256 ---- /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXMAKINGDLL_WXLUA /DWXLUA_LUA_NEWTHREAD /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ *************** *** 424,428 **** /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_41) \ ! $(____BUILD_42) $(______BUILD) /Fd..\..\..\lib\vc_lib\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 424,428 ---- /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_41) \ ! $(____BUILD_42) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ *************** *** 489,493 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_lib\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" --- 489,493 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" *************** *** 717,723 **** -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_lib\wx.dll del ..\..\..\lib\vc_lib\wx.dll ! -if exist ..\..\..\lib\vc_lib\wx.ilk del ..\..\..\lib\vc_lib\wx.ilk ! -if exist ..\..\..\lib\vc_lib\wx.pdb del ..\..\..\lib\vc_lib\wx.pdb !if "$(SHARED)" == "0" --- 717,723 ---- -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_dll\wx.dll del ..\..\..\lib\vc_dll\wx.dll ! -if exist ..\..\..\lib\vc_dll\wx.ilk del ..\..\..\lib\vc_dll\wx.ilk ! -if exist ..\..\..\lib\vc_dll\wx.pdb del ..\..\..\lib\vc_dll\wx.pdb !if "$(SHARED)" == "0" *************** *** 827,833 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_lib\wx.dll: $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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 << !endif --- 827,833 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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 << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.bcc 20 May 2006 18:22:26 -0000 1.46 --- makefile.bcc 20 May 2006 20:17:56 -0000 1.47 *************** *** 262,267 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ --- 262,267 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ *************** *** 274,278 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ --- 274,278 ---- -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ *************** *** 488,492 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_lib\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" --- 488,492 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" *************** *** 713,722 **** -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_lib\wx.dll del ..\..\..\lib\bcc_lib\wx.dll ! -if exist ..\..\..\lib\bcc_lib\wx.tds del ..\..\..\lib\bcc_lib\wx.tds ! -if exist ..\..\..\lib\bcc_lib\wx.ilc del ..\..\..\lib\bcc_lib\wx.ilc ! -if exist ..\..\..\lib\bcc_lib\wx.ild del ..\..\..\lib\bcc_lib\wx.ild ! -if exist ..\..\..\lib\bcc_lib\wx.ilf del ..\..\..\lib\bcc_lib\wx.ilf ! -if exist ..\..\..\lib\bcc_lib\wx.ils del ..\..\..\lib\bcc_lib\wx.ils !if "$(SHARED)" == "0" --- 713,722 ---- -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_dll\wx.dll del ..\..\..\lib\bcc_dll\wx.dll ! -if exist ..\..\..\lib\bcc_dll\wx.tds del ..\..\..\lib\bcc_dll\wx.tds ! -if exist ..\..\..\lib\bcc_dll\wx.ilc del ..\..\..\lib\bcc_dll\wx.ilc ! -if exist ..\..\..\lib\bcc_dll\wx.ild del ..\..\..\lib\bcc_dll\wx.ild ! -if exist ..\..\..\lib\bcc_dll\wx.ilf del ..\..\..\lib\bcc_dll\wx.ilf ! -if exist ..\..\..\lib\bcc_dll\wx.ils del ..\..\..\lib\bcc_dll\wx.ils !if "$(SHARED)" == "0" *************** *** 833,839 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_lib\wx.dll: $(MOD_LUAMODULE_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 $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | !endif --- 833,839 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_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 $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | !endif Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** modules_mod_wxlua.dsp 20 May 2006 13:12:35 -0000 1.22 --- modules_mod_wxlua.dsp 20 May 2006 20:17:57 -0000 1.23 *************** *** 56,65 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 56,65 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 81,90 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 81,90 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 106,115 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 106,115 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 131,140 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 131,140 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 156,165 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 156,165 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 181,190 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 181,190 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 206,215 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 206,215 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 231,240 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 231,240 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 256,261 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 256,261 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 279,284 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 279,284 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 302,307 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 302,307 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 325,330 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 325,330 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 348,353 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 348,353 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 371,376 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 371,376 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 394,399 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 394,399 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 417,422 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 417,422 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.wat 20 May 2006 18:22:26 -0000 1.45 --- makefile.wat 20 May 2006 20:17:57 -0000 1.46 *************** *** 179,183 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_lib\wx.dll !endif !endif --- 179,183 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_dll\wx.dll !endif !endif *************** *** 669,673 **** -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & --- 669,673 ---- -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & *************** *** 680,684 **** -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & --- 680,685 ---- -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA -dWXLUA_LUA_NEWTHREAD & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & *************** *** 870,874 **** -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_lib\wx.dll del ..\..\..\lib\wat_lib\wx.dll !ifeq SHARED 0 --- 871,875 ---- -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_dll\wx.dll del ..\..\..\lib\wat_dll\wx.dll !ifeq SHARED 0 *************** *** 1040,1044 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_lib\wx.dll : $(MOD_LUAMODULE_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc option quiet --- 1041,1045 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_dll\wx.dll : $(MOD_LUAMODULE_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc option quiet *************** *** 1047,1051 **** @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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)\mod_luamodule.lbc library %i @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc system nt_dll --- 1048,1052 ---- @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib 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)\mod_luamodule.lbc library %i @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc system nt_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.gcc 20 May 2006 18:22:26 -0000 1.46 --- makefile.gcc 20 May 2006 20:17:57 -0000 1.47 *************** *** 221,225 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ --- 221,225 ---- -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ *************** *** 232,236 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\includ... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:18:05
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8475/modules/build/bakefiles Modified Files: modules.bkl Log Message: changed luamodule to link against verbatim lua and output result in DLL dir Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** modules.bkl 20 May 2006 14:17:44 -0000 1.33 --- modules.bkl 20 May 2006 20:17:56 -0000 1.34 *************** *** 44,51 **** <!-- ================================================================== --> ! <!-- the VERBATIM lua lib & dll --> <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> --- 44,58 ---- <!-- ================================================================== --> ! <!-- the VERBATIM lua lib & dll: these are needed for linking the "mod_luamodule" ! (see below); in fact, trying to link statically "mod_luamodule" with lua core ! is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand ! why (basically because lua core gets duplicated). ! ! Instead we need a verbatim lua DLL to create the "wx.so/.dll" DLL without any ! dangerous duplication of code. ! --> <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> *************** *** 56,60 **** <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> <dllname>lua5.1</dllname> --- 63,67 ---- <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> --> <libname>lua5.1</libname> <dllname>lua5.1</dllname> *************** *** 96,103 **** --- 103,112 ---- <wxlua_stdlib id="wxlua_lib" cond="SHARED=='0'"> <module-name>WXLUA</module-name> + <define>WXLUA_LUA_NEWTHREAD</define> </wxlua_stdlib> <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> <wxlua-lib>lua</wxlua-lib> + <define>WXLUA_LUA_NEWTHREAD</define> </wxlua_stddll> *************** *** 147,151 **** <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> --- 156,160 ---- <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> *************** *** 158,162 **** <dllname>wx</dllname> ! <wxlua-allstdlibs/> <wx-alllibs-req-bywxlua/> </module> --- 167,178 ---- <dllname>wx</dllname> ! <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim ! version of lua, while we need the verbatim one (lua5.1.so/.dll) --> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>wxbind</wxlua-lib> ! <wxlua-lib>wxluasocket</wxlua-lib> ! <wxlua-lib>wxluadebug</wxlua-lib> ! <sys-lib>lua5.1</sys-lib> ! <wx-alllibs-req-bywxlua/> </module> |
|
From: Francesco M. <fr...@us...> - 2006-05-20 20:18:02
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8475/modules Modified Files: Makefile.in Log Message: changed luamodule to link against verbatim lua and output result in DLL dir Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Makefile.in 20 May 2006 18:22:25 -0000 1.39 --- Makefile.in 20 May 2006 20:17:56 -0000 1.40 *************** *** 186,191 **** lua_dll_linit.o WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ --- 186,191 ---- lua_dll_linit.o WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXLUA_LUA_NEWTHREAD \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ *************** *** 194,199 **** wxlua_lib_internal.o WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ --- 194,199 ---- wxlua_lib_internal.o WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA \ ! -DWXLUA_LUA_NEWTHREAD $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ *************** *** 1184,1188 **** @COND_SHARED_1_USE_LUAMODULE_1@$(top_builddir)lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: --- 1184,1188 ---- @COND_SHARED_1_USE_LUAMODULE_1@$(top_builddir)lib/$(DLLPREFIX_MODULE)wx.$(SO_SUFFIX_MODULE): $(MOD_LUAMODULE_OBJECTS) ! @COND_SHARED_1_USE_LUAMODULE_1@ $(SHARED_LD_MODULE_CXX) $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_SHARED_1_USE_LUAMODULE_1@install_mod_luamodule: |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:58:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1213/modules/wxluadebug/include Modified Files: splttree.h staktree.h wxldebug.h Added Files: wxluadebugdefs.h Log Message: Fixed DLL builds introducing/updating all required WXDLLIMPEXP symbols Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldebug.h 8 Mar 2006 02:46:37 -0000 1.15 --- wxldebug.h 20 May 2006 19:57:59 -0000 1.16 *************** *** 32,37 **** #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" ! class WXDLLIMPEXP_WXLUA wxLuaDebugData; // ---------------------------------------------------------------------------- --- 32,38 ---- #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" + #include "wxluadebug/include/wxluadebugdefs.h" ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData; // ---------------------------------------------------------------------------- *************** *** 39,43 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugDataItem : public wxTreeItemData { public: --- 40,44 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugDataItem : public wxTreeItemData { public: *************** *** 71,79 **** }; ! #if defined(WXMAKINGDLL_WXLUA) || defined(WXUSINGDLL) ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray, WXDLLIMPEXP_WXLUA ); ! #else // not making nor using DLL ! WX_DEFINE_SORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray ); ! #endif // ---------------------------------------------------------------------------- --- 72,76 ---- }; ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray, WXDLLIMPEXP_WXLUADEBUG ); // ---------------------------------------------------------------------------- *************** *** 82,86 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugData : public wxLuaDebugDataItemArray { public: --- 79,83 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData : public wxLuaDebugDataItemArray { public: *************** *** 115,119 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaInterface { public: --- 112,116 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaInterface { public: Index: splttree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** splttree.h 15 May 2006 04:48:37 -0000 1.7 --- splttree.h 20 May 2006 19:57:59 -0000 1.8 *************** *** 21,31 **** #include "wxlua/include/wxldefs.h" #include "wx/treectrl.h" #include "wx/splitter.h" #include "wx/scrolwin.h" ! class WXDLLIMPEXP_WXLUA wxRemotelyScrolledTreeCtrl; ! class WXDLLIMPEXP_WXLUA wxThinSplitterWindow; ! class WXDLLIMPEXP_WXLUA wxSplitterScrolledWindow; --- 21,32 ---- #include "wxlua/include/wxldefs.h" + #include "wxluadebug/include/wxluadebugdefs.h" #include "wx/treectrl.h" #include "wx/splitter.h" #include "wx/scrolwin.h" ! class WXDLLIMPEXP_WXLUADEBUG wxRemotelyScrolledTreeCtrl; ! class WXDLLIMPEXP_WXLUADEBUG wxThinSplitterWindow; ! class WXDLLIMPEXP_WXLUADEBUG wxSplitterScrolledWindow; *************** *** 43,47 **** */ ! class WXDLLIMPEXP_WXLUA wxRemotelyScrolledTreeCtrl : public wxTreeCtrl { public: --- 44,48 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxRemotelyScrolledTreeCtrl : public wxTreeCtrl { public: *************** *** 143,147 **** */ ! class WXDLLIMPEXP_WXLUA wxTreeCompanionWindow: public wxWindow { public: --- 144,148 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxTreeCompanionWindow: public wxWindow { public: *************** *** 191,195 **** */ ! class WXDLLIMPEXP_WXLUA wxThinSplitterWindow : public wxSplitterWindow { public: --- 192,196 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxThinSplitterWindow : public wxSplitterWindow { public: *************** *** 226,230 **** */ ! class WXDLLIMPEXP_WXLUA wxSplitterScrolledWindow: public wxScrolledWindow { public: --- 227,231 ---- */ ! class WXDLLIMPEXP_WXLUADEBUG wxSplitterScrolledWindow: public wxScrolledWindow { public: --- NEW FILE: wxluadebugdefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxluadebugdefs.h // Purpose: definitions for wxLuaDebug module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxluadebugdefs.h,v 1.1 2006/05/20 19:57:59 frm Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXLUADEBUGDEFS_H__ #define __WX_WXLUADEBUGDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXLUADEBUG #define WXDLLIMPEXP_WXLUADEBUG WXEXPORT #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXLUADEBUG WXIMPORT #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXLUADEBUG #define WXDLLIMPEXP_DATA_WXLUADEBUG(type) type #endif #endif // __WX_WXLUADEBUGDEFS_H__ Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** staktree.h 15 May 2006 04:48:37 -0000 1.7 --- staktree.h 20 May 2006 19:57:59 -0000 1.8 *************** *** 16,25 **** #include "wxlua/include/wxldefs.h" #include "wxluadebug/include/splttree.h" ! class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow; ! class WXDLLIMPEXP_WXLUA wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUA wxLuaInterface; ! class WXDLLIMPEXP_WXLUA wxLuaDebugData; // ---------------------------------------------------------------------------- --- 16,26 ---- #include "wxlua/include/wxldefs.h" + #include "wxluadebug/include/wxluadebugdefs.h" #include "wxluadebug/include/splttree.h" ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDataWindow; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaInterface; ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData; // ---------------------------------------------------------------------------- *************** *** 41,45 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackDialog : public wxDialog { public: --- 42,46 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog : public wxDialog { public: *************** *** 99,103 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackTree : public wxRemotelyScrolledTreeCtrl { public: --- 100,104 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackTree : public wxRemotelyScrolledTreeCtrl { public: *************** *** 119,123 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow : public wxTreeCompanionWindow { public: --- 120,124 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDataWindow : public wxTreeCompanionWindow { public: |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:58:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1213/modules/wxluasocket/include Modified Files: dservice.h wxldbgio.h wxldserv.h wxldtarg.h wxlhandl.h wxlsock.h Added Files: wxluasocketdefs.h Log Message: Fixed DLL builds introducing/updating all required WXDLLIMPEXP symbols Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxldserv.h 8 Mar 2006 02:46:37 -0000 1.7 --- wxldserv.h 20 May 2006 19:57:59 -0000 1.8 *************** *** 15,26 **** #include "wx/process.h" ! #include "wxlua/include/wxldefs.h" #include "wxluadebug/include/wxldebug.h" #include "wxluasocket/include/wxlsock.h" #include "wxluasocket/include/wxldbgio.h" ! class WXDLLIMPEXP_WXLUA wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent; ! class WXDLLIMPEXP_WXLUA wxLuaStackDialog; // ---------------------------------------------------------------------------- --- 15,26 ---- #include "wx/process.h" ! #include "wxluasocket/include/wxluasocketdefs.h" #include "wxluadebug/include/wxldebug.h" #include "wxluasocket/include/wxlsock.h" #include "wxluasocket/include/wxldbgio.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaStackDialog; // ---------------------------------------------------------------------------- *************** *** 71,75 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugServerInterface : public wxLuaInterface { public: --- 71,75 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerInterface : public wxLuaInterface { public: *************** *** 92,96 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugServerThread : public wxThread { public: --- 92,96 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerThread : public wxThread { public: *************** *** 114,118 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebuggerBase : public wxEvtHandler { public: --- 114,118 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase : public wxEvtHandler { public: *************** *** 144,148 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugServer : public wxLuaDebuggerBase, public wxLuaDebugIO { public: --- 144,148 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer : public wxLuaDebuggerBase, public wxLuaDebugIO { public: *************** *** 209,213 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent : public wxEvent { public: --- 209,213 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent : public wxEvent { public: *************** *** 248,264 **** BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_TABLE_ENUM, 2517) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() --- 248,264 ---- BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_TABLE_ENUM, 2517) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() Index: wxldbgio.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldbgio.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxldbgio.h 1 Mar 2006 23:12:11 -0000 1.2 --- wxldbgio.h 20 May 2006 19:57:59 -0000 1.3 *************** *** 14,21 **** #endif ! #include "wxlua/include/wxldefs.h" ! class WXDLLIMPEXP_WXLUA wxLuaDebugData; ! class WXDLLIMPEXP_WXLUA wxLuaSocket; // ---------------------------------------------------------------------------- --- 14,21 ---- #endif ! #include "wxluasocket/include/wxluasocketdefs.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugData; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocket; // ---------------------------------------------------------------------------- *************** *** 24,28 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugIO { protected: --- 24,28 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugIO { protected: Index: dservice.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dservice.h 8 Apr 2006 18:22:34 -0000 1.10 --- dservice.h 20 May 2006 19:57:59 -0000 1.11 *************** *** 21,25 **** #endif ! #include "wxlua/include/wxldefs.h" #include "wx/dynarray.h" --- 21,25 ---- #endif ! #include "wxluasocket/include/wxluasocketdefs.h" #include "wx/dynarray.h" *************** *** 47,52 **** #define WXLUA_SOCKET_PORT 1561 ! class WXDLLIMPEXP_WXLUA wxLuaDebugService; ! class WXDLLIMPEXP_WXLUA wxLuaDebuggee; // ---------------------------------------------------------------------------- --- 47,52 ---- #define WXLUA_SOCKET_PORT 1561 ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugService; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee; // ---------------------------------------------------------------------------- *************** *** 54,58 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugSocket { public: --- 54,58 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugSocket { public: *************** *** 119,123 **** }; ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebugSocket, wxLuaDebugSocketList, WXDLLIMPEXP_WXLUA); // ---------------------------------------------------------------------------- --- 119,123 ---- }; ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebugSocket, wxLuaDebugSocketList, WXDLLIMPEXP_WXLUASOCKET); // ---------------------------------------------------------------------------- *************** *** 125,129 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaBreakPoint : public wxObject { public: --- 125,129 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaBreakPoint : public wxObject { public: *************** *** 165,169 **** }; ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaBreakPoint, wxLuaBreakPointList, WXDLLIMPEXP_WXLUA); // ---------------------------------------------------------------------------- --- 165,169 ---- }; ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaBreakPoint, wxLuaBreakPointList, WXDLLIMPEXP_WXLUASOCKET); // ---------------------------------------------------------------------------- *************** *** 171,175 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebuggee : public wxObject { friend class wxLuaDebugService; --- 171,175 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggee : public wxObject { friend class wxLuaDebugService; *************** *** 245,249 **** ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebuggee, wxLuaDebuggeeList, WXDLLIMPEXP_WXLUA); // ---------------------------------------------------------------------------- --- 245,249 ---- ! WX_DECLARE_USER_EXPORTED_LIST(wxLuaDebuggee, wxLuaDebuggeeList, WXDLLIMPEXP_WXLUASOCKET); // ---------------------------------------------------------------------------- *************** *** 251,255 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugService : public wxEvtHandler { public: --- 251,255 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugService : public wxEvtHandler { public: *************** *** 309,313 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugger : public wxLuaDebuggerBase { public: --- 309,313 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugger : public wxLuaDebuggerBase { public: --- NEW FILE: wxluasocketdefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxluadebugdefs.h // Purpose: definitions for wxLuaDebug module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxluasocketdefs.h,v 1.1 2006/05/20 19:57:59 frm Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXLUASOCKETDEFS_H__ #define __WX_WXLUASOCKETDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXLUASOCKET #define WXDLLIMPEXP_WXLUASOCKET WXEXPORT #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXLUASOCKET WXIMPORT #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXLUASOCKET #define WXDLLIMPEXP_DATA_WXLUASOCKET(type) type #endif #endif // __WX_WXLUASOCKETDEFS_H__ Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlsock.h 2 Mar 2006 03:50:40 -0000 1.5 --- wxlsock.h 20 May 2006 19:57:59 -0000 1.6 *************** *** 15,19 **** #endif ! #include "wxlua/include/wxldefs.h" #ifdef WIN32 --- 15,19 ---- #endif ! #include "wxluasocket/include/wxluasocketdefs.h" #ifdef WIN32 *************** *** 42,46 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaSocket { #ifdef WIN32 --- 42,46 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocket { #ifdef WIN32 *************** *** 139,143 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaSocketException { public: --- 139,143 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaSocketException { public: Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxldtarg.h 8 Apr 2006 18:22:35 -0000 1.9 --- wxldtarg.h 20 May 2006 19:57:59 -0000 1.10 *************** *** 16,20 **** #include "wx/dynarray.h" ! #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" --- 16,20 ---- #include "wx/dynarray.h" ! #include "wxluasocket/include/wxluasocketdefs.h" #include "wxlua/include/wxlua.h" #include "wxlua/include/internal.h" *************** *** 27,31 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaBuffer : public wxObject { public: --- 27,31 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaBuffer : public wxObject { public: *************** *** 45,49 **** #if wxCHECK_VERSION(2, 5, 0) ! WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray, class WXDLLIMPEXP_WXLUA); #else WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray); --- 45,49 ---- #if wxCHECK_VERSION(2, 5, 0) ! WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray, class WXDLLIMPEXP_WXLUASOCKET); #else WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray); *************** *** 55,59 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaDebugTarget : public wxObject, public wxLuaDebugIO { private: --- 55,59 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugTarget : public wxObject, public wxLuaDebugIO { private: Index: wxlhandl.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlhandl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlhandl.h 8 Mar 2006 02:46:37 -0000 1.4 --- wxlhandl.h 20 May 2006 19:57:59 -0000 1.5 *************** *** 16,24 **** #endif ! #include "wxlua/include/wxldefs.h" #include "wx/thread.h" ! class WXDLLIMPEXP_WXLUA wxLuaDebugEvent; ! class WXDLLIMPEXP_WXLUA wxLuaStackDialog; // ---------------------------------------------------------------------------- --- 16,24 ---- #endif ! #include "wxluasocket/include/wxluasocketdefs.h" #include "wx/thread.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaStackDialog; // ---------------------------------------------------------------------------- *************** *** 26,30 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaHandler { public: --- 26,30 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaHandler { public: |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:58:04
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1213/modules/luamodule/src Modified Files: luamodule.cpp Log Message: Fixed DLL builds introducing/updating all required WXDLLIMPEXP symbols Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/luamodule.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luamodule.cpp 20 May 2006 12:18:47 -0000 1.1 --- luamodule.cpp 20 May 2006 19:57:58 -0000 1.2 *************** *** 8,11 **** --- 8,12 ---- #include "wx/wx.h" + #include "wx/image.h" // for wxInitAllImageHandlers #include "wxlua/include/wxlstate.h" |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:26
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: modified wrapper generator to include export symbols Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wx_rules.lua 24 Apr 2006 02:33:26 -0000 1.14 --- wx_rules.lua 20 May 2006 19:40:19 -0000 1.15 *************** *** 22,25 **** --- 22,28 ---- output_cpp_filepath = wxlua_dir.."modules/wxbind/src" + output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBIND" + output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBIND" + ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the *************** *** 64,67 **** --- 67,71 ---- "#include \"wx/defs.h\"\n".. "#include \"wxluasetup.h\"\n".. + "#include \"wxbind/include/wxbinddefs.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/modules/wxlua/include Modified Files: internal.h wxlbind.h Log Message: modified wrapper generator to include export symbols Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlbind.h 20 May 2006 14:00:48 -0000 1.19 --- wxlbind.h 20 May 2006 19:40:19 -0000 1.20 *************** *** 15,19 **** #include "wxlua/include/wxldefs.h" - #include "wxbind/include/wxbinddefs.h" extern "C" --- 15,18 ---- *************** *** 30,38 **** // memory deallocation function, lua's __gc ! int LUACALL wxLua_lua_garbageCollect(lua_State *L); // lua 'set table' tag method handler, lua's __newindex ! int LUACALL wxLua_lua_setTableFunc(lua_State *L); // lua 'get table' tag method handler, lua's __index ! int LUACALL wxLua_lua_getTableFunc(lua_State *L); // ---------------------------------------------------------------------------- --- 29,37 ---- // memory deallocation function, lua's __gc ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_garbageCollect(lua_State *L); // lua 'set table' tag method handler, lua's __newindex ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_setTableFunc(lua_State *L); // lua 'get table' tag method handler, lua's __index ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getTableFunc(lua_State *L); // ---------------------------------------------------------------------------- *************** *** 53,57 **** typedef int* wxLuaArgTag; // address of class tag ! struct WXLUAMETHOD // defines a LUA method or property { LuaType type; // type (one of the above enumeration values) --- 52,56 ---- typedef int* wxLuaArgTag; // address of class tag ! struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property { LuaType type; // type (one of the above enumeration values) *************** *** 73,77 **** extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; ! struct WXLUACLASS // defines a LUA class interface { const char *name; // name of the class --- 72,76 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; ! struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA class interface { const char *name; // name of the class *************** *** 85,89 **** }; ! struct WXLUADEFINE // defines a wxWidgets define for wxLua { const char *name; // name --- 84,88 ---- }; ! struct WXDLLIMPEXP_WXLUA WXLUADEFINE // defines a wxWidgets define for wxLua { const char *name; // name *************** *** 91,95 **** }; ! struct WXLUASTRING // defines a wxWidgets string for wxLua { const char *name; // name --- 90,94 ---- }; ! struct WXDLLIMPEXP_WXLUA WXLUASTRING // defines a wxWidgets string for wxLua { const char *name; // name *************** *** 97,101 **** }; ! struct WXLUAEVENT // defines a wxWidgets Event for wxLua { const int *eventType; // new wxWidgets event type --- 96,100 ---- }; ! struct WXDLLIMPEXP_WXLUA WXLUAEVENT // defines a wxWidgets Event for wxLua { const int *eventType; // new wxWidgets event type *************** *** 104,108 **** }; ! struct WXLUAOBJECT // Defines a wxWidgets object or pointer for wxLua { const void *objPtr; // a pointer to the object or pointer --- 103,107 ---- }; ! struct WXDLLIMPEXP_WXLUA WXLUAOBJECT // Defines a wxWidgets object or pointer for wxLua { const void *objPtr; // a pointer to the object or pointer *************** *** 155,162 **** // ---------------------------------------------------------------------------- ! #define wxLUA_DECLARE_ENCAPSULATION(theObject) \ class theObject; \ ! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \ ! class wxObject_##theObject : public wxObject \ { \ public: \ --- 154,161 ---- // ---------------------------------------------------------------------------- ! #define wxLUA_DECLARE_ENCAPSULATION(IMPEXPSYMBOL, theObject) \ class theObject; \ ! IMPEXPSYMBOL void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \ ! class IMPEXPSYMBOL wxObject_##theObject : public wxObject \ { \ public: \ *************** *** 187,191 **** // garbage collection purposes. This is a C function for symmetry with // the functions defined using wxLUA_DECLARE_ENCAPSULATION. ! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *); // ---------------------------------------------------------------------------- --- 186,190 ---- // garbage collection purposes. This is a C function for symmetry with // the functions defined using wxLUA_DECLARE_ENCAPSULATION. ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *); // ---------------------------------------------------------------------------- Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** internal.h 20 May 2006 14:00:48 -0000 1.29 --- internal.h 20 May 2006 19:40:19 -0000 1.30 *************** *** 107,111 **** // ---------------------------------------------------------------------------- ! class wxLuaTreeItemData : public wxTreeItemData { public: --- 107,111 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaTreeItemData : public wxTreeItemData { public: |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/modules/wxbind/include Modified Files: wxbind.h Log Message: modified wrapper generator to include export symbols Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxbind.h 20 May 2006 18:09:01 -0000 1.28 --- wxbind.h 20 May 2006 19:40:19 -0000 1.29 *************** *** 13,16 **** --- 13,17 ---- #include "wx/defs.h" #include "wxluasetup.h" + #include "wxbind/include/wxbinddefs.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 *************** *** 36,42 **** // bind wxLuaBinding_wx to a single wxLuaState ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wx_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wx for all wxLuaStates ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wx_init(); --- 37,43 ---- // bind wxLuaBinding_wx to a single wxLuaState ! extern WXDLLIMPEXP_WXBIND bool wxLuaBinding_wx_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wx for all wxLuaStates ! extern WXDLLIMPEXP_WXBIND bool wxLuaBinding_wx_init(); *************** *** 2831,2972 **** ! wxLUA_DECLARE_ENCAPSULATION(wxBusyCursor) ! wxLUA_DECLARE_ENCAPSULATION(wxProcess) ! wxLUA_DECLARE_ENCAPSULATION(wxWindowDisabler) #if wxCHECK_VERSION(2,7,0) ! wxLUA_DECLARE_ENCAPSULATION(wxMouseState) #endif #if wxLUA_USE_Geometry ! wxLUA_DECLARE_ENCAPSULATION(wxPoint2DDouble) ! wxLUA_DECLARE_ENCAPSULATION(wxPoint2DInt) ! wxLUA_DECLARE_ENCAPSULATION(wxRect2DDouble) ! wxLUA_DECLARE_ENCAPSULATION(wxRect2DInt) #endif #if wxLUA_USE_wxAcceleratorTable ! wxLUA_DECLARE_ENCAPSULATION(wxAcceleratorEntry) #endif #if wxLUA_USE_wxArrayInt ! wxLUA_DECLARE_ENCAPSULATION(wxArrayInt) #endif #if wxLUA_USE_wxArrayString ! wxLUA_DECLARE_ENCAPSULATION(wxArrayString) #endif #if wxLUA_USE_wxCalendarCtrl ! wxLUA_DECLARE_ENCAPSULATION(wxCalendarDateAttr) #endif #if wxLUA_USE_wxCriticalSection ! wxLUA_DECLARE_ENCAPSULATION(wxCriticalSection) #endif #if wxLUA_USE_wxCriticalSectionLocker ! wxLUA_DECLARE_ENCAPSULATION(wxCriticalSectionLocker) #endif #if wxLUA_USE_wxDataObject ! wxLUA_DECLARE_ENCAPSULATION(wxBitmapDataObject) ! wxLUA_DECLARE_ENCAPSULATION(wxDataFormat) ! wxLUA_DECLARE_ENCAPSULATION(wxDataObjectComposite) ! wxLUA_DECLARE_ENCAPSULATION(wxDataObjectSimple) ! wxLUA_DECLARE_ENCAPSULATION(wxFileDataObject) ! wxLUA_DECLARE_ENCAPSULATION(wxTextDataObject) #endif #if wxLUA_USE_wxDateSpan ! wxLUA_DECLARE_ENCAPSULATION(wxDateSpan) #endif #if wxLUA_USE_wxDateTime ! wxLUA_DECLARE_ENCAPSULATION(wxDateTime) #endif #if wxLUA_USE_wxDir ! wxLUA_DECLARE_ENCAPSULATION(wxDir) #endif #if wxLUA_USE_wxDragDrop ! wxLUA_DECLARE_ENCAPSULATION(wxDropSource) #endif #if wxLUA_USE_wxFile ! wxLUA_DECLARE_ENCAPSULATION(wxFile) #endif #if wxLUA_USE_wxFileName ! wxLUA_DECLARE_ENCAPSULATION(wxFileName) #endif #if wxLUA_USE_wxFontEnumerator ! wxLUA_DECLARE_ENCAPSULATION(wxFontEnumerator) #endif #if wxLUA_USE_wxGrid ! wxLUA_DECLARE_ENCAPSULATION(wxGridCellCoords) #endif #if wxLUA_USE_wxListCtrl ! wxLUA_DECLARE_ENCAPSULATION(wxListItemAttr) #endif #if wxLUA_USE_wxPointSizeRect ! wxLUA_DECLARE_ENCAPSULATION(wxPoint) ! wxLUA_DECLARE_ENCAPSULATION(wxRect) ! wxLUA_DECLARE_ENCAPSULATION(wxSize) #endif #if wxLUA_USE_wxRegEx ! wxLUA_DECLARE_ENCAPSULATION(wxRegEx) #endif #if wxLUA_USE_wxSizer ! wxLUA_DECLARE_ENCAPSULATION(wxGBPosition) ! wxLUA_DECLARE_ENCAPSULATION(wxGBSpan) #endif #if wxLUA_USE_wxTextCtrl ! wxLUA_DECLARE_ENCAPSULATION(wxTextAttr) #endif #if wxLUA_USE_wxTimeSpan ! wxLUA_DECLARE_ENCAPSULATION(wxTimeSpan) #endif #if wxLUA_USE_wxTreeCtrl ! wxLUA_DECLARE_ENCAPSULATION(wxTreeItemId) #endif #if wxLUA_USE_wxXMLResource ! wxLUA_DECLARE_ENCAPSULATION(wxXmlNode) ! wxLUA_DECLARE_ENCAPSULATION(wxXmlProperty) #endif --- 2832,2973 ---- ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxProcess) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler) #if wxCHECK_VERSION(2,7,0) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxMouseState) #endif #if wxLUA_USE_Geometry ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint2DDouble) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint2DInt) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRect2DDouble) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRect2DInt) #endif #if wxLUA_USE_wxAcceleratorTable ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxAcceleratorEntry) #endif #if wxLUA_USE_wxArrayInt ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayInt) #endif #if wxLUA_USE_wxArrayString ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayString) #endif #if wxLUA_USE_wxCalendarCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCalendarDateAttr) #endif #if wxLUA_USE_wxCriticalSection ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCriticalSection) #endif #if wxLUA_USE_wxCriticalSectionLocker ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCriticalSectionLocker) #endif #if wxLUA_USE_wxDataObject ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBitmapDataObject) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDataFormat) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDataObjectComposite) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDataObjectSimple) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileDataObject) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTextDataObject) #endif #if wxLUA_USE_wxDateSpan ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateSpan) #endif #if wxLUA_USE_wxDateTime ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTime) #endif #if wxLUA_USE_wxDir ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDir) #endif #if wxLUA_USE_wxDragDrop ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDropSource) #endif #if wxLUA_USE_wxFile ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFile) #endif #if wxLUA_USE_wxFileName ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileName) #endif #if wxLUA_USE_wxFontEnumerator ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFontEnumerator) #endif #if wxLUA_USE_wxGrid ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGridCellCoords) #endif #if wxLUA_USE_wxListCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxListItemAttr) #endif #if wxLUA_USE_wxPointSizeRect ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRect) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSize) #endif #if wxLUA_USE_wxRegEx ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRegEx) #endif #if wxLUA_USE_wxSizer ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBPosition) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBSpan) #endif #if wxLUA_USE_wxTextCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTextAttr) #endif #if wxLUA_USE_wxTimeSpan ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTimeSpan) #endif #if wxLUA_USE_wxTreeCtrl ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTreeItemId) #endif #if wxLUA_USE_wxXMLResource ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlNode) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxXmlProperty) #endif |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:25
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/bindings/wxstc Modified Files: wxstc_rules.lua Log Message: modified wrapper generator to include export symbols Index: wxstc_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_rules.lua,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxstc_rules.lua 24 Apr 2006 02:33:26 -0000 1.13 --- wxstc_rules.lua 20 May 2006 19:40:19 -0000 1.14 *************** *** 22,25 **** --- 22,28 ---- output_cpp_filepath = wxlua_dir.."modules/wxbindstc/src" + output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBINDSTC" + output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBINDSTC" + ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the *************** *** 58,62 **** hook_cpp_binding_header_includes = "#include \"wx/defs.h\"\n".. ! "#include \"wxbind/include/wxbind.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" --- 61,66 ---- 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".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:25
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/modules/wxbindstc/include Modified Files: wxbind.h Added Files: wxbindstcdefs.h Log Message: modified wrapper generator to include export symbols Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxbind.h 20 May 2006 18:09:01 -0000 1.7 --- wxbind.h 20 May 2006 19:40:19 -0000 1.8 *************** *** 12,16 **** #include "wx/defs.h" ! #include "wxbind/include/wxbind.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 --- 12,17 ---- #include "wx/defs.h" ! #include "wxbindstc/include/wxbind.h" ! #include "wxbindstc/include/wxbindstcdefs.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 *************** *** 36,42 **** // bind wxLuaBinding_wxstc to a single wxLuaState ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wxstc_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxstc for all wxLuaStates ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wxstc_init(); --- 37,43 ---- // bind wxLuaBinding_wxstc to a single wxLuaState ! extern WXDLLIMPEXP_WXBINDSTC bool wxLuaBinding_wxstc_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxstc for all wxLuaStates ! extern WXDLLIMPEXP_WXBINDSTC bool wxLuaBinding_wxstc_init(); *************** *** 49,54 **** #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStyledTextCtrl; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStyledTextEvent; #endif --- 50,55 ---- #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextCtrl; ! extern WXDLLIMPEXP_DATA_WXBINDSTC(int) s_wxluatag_wxStyledTextEvent; #endif *************** *** 58,65 **** #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStyledTextCtrl_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStyledTextEvent_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxStyledTextEvent_methodCount; #endif --- 59,66 ---- #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD* wxStyledTextCtrl_methods; ! extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBINDSTC WXLUAMETHOD* wxStyledTextEvent_methods; ! extern WXDLLIMPEXP_DATA_WXBINDSTC(int) wxStyledTextEvent_methodCount; #endif --- NEW FILE: wxbindstcdefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxbindstcdefs.h // Purpose: definitions for wxBindSTC module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxbindstcdefs.h,v 1.1 2006/05/20 19:40:19 frm Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXBINDSTCDEFS_H__ #define __WX_WXBINDSTCDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXBINDSTC #define WXDLLIMPEXP_WXBINDSTC WXEXPORT #define WXDLLIMPEXP_DATA_WXBINDSTC(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXBINDSTC WXIMPORT #define WXDLLIMPEXP_DATA_WXBINDSTC(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXBINDSTC #define WXDLLIMPEXP_DATA_WXBINDSTC(type) type #endif #endif // __WX_WXBINDSTCDEFS_H__ |
|
From: Francesco M. <fr...@us...> - 2006-05-20 19:40:25
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24463/bindings Modified Files: genwxbind.lua Log Message: modified wrapper generator to include export symbols Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** genwxbind.lua 20 May 2006 18:09:00 -0000 1.65 --- genwxbind.lua 20 May 2006 19:40:17 -0000 1.66 *************** *** 64,71 **** assert(type(output_cpp_filepath) == "string", "output_cpp_filepath is not a string") assert(type(output_cpp_header_filepath) == "string", "output_cpp_header_filepath is not a string") ! assert(type(hook_lua_namespace) == "string", "hook_lua_namespace is not a string") assert(type(hook_cpp_namespace) == "string", "hook_cpp_namespace is not a string") - end --- 64,73 ---- assert(type(output_cpp_filepath) == "string", "output_cpp_filepath is not a string") assert(type(output_cpp_header_filepath) == "string", "output_cpp_header_filepath is not a string") ! assert(type(output_cpp_impexpsymbol) == "string", "output_cpp_impexpsymbol is not a string") ! assert(type(output_cpp_impexpdatasymbol) == "string", "output_cpp_impexpdatasymbol is not a string") ! ! assert(type(hook_lua_namespace) == "string", "hook_lua_namespace is not a string") assert(type(hook_cpp_namespace) == "string", "hook_cpp_namespace is not a string") end *************** *** 2600,2604 **** encapsulationBinding = { ! Declaration="wxLUA_DECLARE_ENCAPSULATION("..parseObject.Name..")\n", Implementation="wxLUA_IMPLEMENT_ENCAPSULATION("..parseObject.Name..")\n", Condition=encapcondition --- 2602,2606 ---- encapsulationBinding = { ! Declaration="wxLUA_DECLARE_ENCAPSULATION("..output_cpp_impexpsymbol..", "..parseObject.Name..")\n", Implementation="wxLUA_IMPLEMENT_ENCAPSULATION("..parseObject.Name..")\n", Condition=encapcondition *************** *** 2966,2970 **** local objectTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2968,2972 ---- local objectTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3003,3007 **** local objectTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3005,3009 ---- local objectTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3039,3043 **** local eventTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3041,3045 ---- local eventTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3726,3732 **** local classTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } --- 3728,3734 ---- local classTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } *************** *** 3895,3901 **** table.insert(fileData, "// bind "..hook_cpp_binding_classname.." to a single wxLuaState\n") ! table.insert(fileData, "extern WXDLLIMPEXP_DATA_WXBIND(bool) "..hook_cpp_binding_classname.."_bind(const wxLuaState& wxlState);\n") table.insert(fileData, "// initialize "..hook_cpp_binding_classname.." for all wxLuaStates\n") ! table.insert(fileData, "extern WXDLLIMPEXP_DATA_WXBIND(bool) "..hook_cpp_binding_classname.."_init();\n\n") if hook_bind_condition then --- 3897,3903 ---- table.insert(fileData, "// bind "..hook_cpp_binding_classname.." to a single wxLuaState\n") ! table.insert(fileData, "extern "..output_cpp_impexpsymbol.." bool "..hook_cpp_binding_classname.."_bind(const wxLuaState& wxlState);\n") table.insert(fileData, "// initialize "..hook_cpp_binding_classname.." for all wxLuaStates\n") ! table.insert(fileData, "extern "..output_cpp_impexpsymbol.." bool "..hook_cpp_binding_classname.."_init();\n\n") if hook_bind_condition then *************** *** 4786,4789 **** --- 4788,4792 ---- rules() print("loaded rules file: "..rulesFilename) + CheckRules() end |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:22:29
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24910/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxbind.dsp Log Message: readded html.cpp to wxbind module - was removed by mistake Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** modules_mod_wxbind.dsp 20 May 2006 14:17:44 -0000 1.26 --- modules_mod_wxbind.dsp 20 May 2006 18:22:26 -0000 1.27 *************** *** 509,512 **** --- 509,516 ---- # Begin Source File + SOURCE=..\..\wxbind\src\html.cpp + # End Source File + # Begin Source File + SOURCE=..\..\wxbind\src\image.cpp # End Source File *************** *** 577,580 **** --- 581,588 ---- # Begin Source File + SOURCE=..\..\wxbind\include\wxbinddefs.h + # End Source File + # Begin Source File + SOURCE=..\..\wxbind\include\wxlhtmlwin.h # End Source File Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.vc 20 May 2006 14:17:44 -0000 1.44 --- makefile.vc 20 May 2006 18:22:26 -0000 1.45 *************** *** 272,275 **** --- 272,276 ---- msvc$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ *************** *** 311,314 **** --- 312,316 ---- msvc$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ *************** *** 1215,1218 **** --- 1217,1223 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 1302,1305 **** --- 1307,1313 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.bcc 20 May 2006 14:17:44 -0000 1.45 --- makefile.bcc 20 May 2006 18:22:26 -0000 1.46 *************** *** 291,294 **** --- 291,295 ---- borland$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ *************** *** 327,330 **** --- 328,332 ---- borland$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ *************** *** 1221,1224 **** --- 1223,1229 ---- $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 1308,1311 **** --- 1313,1319 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.wat 20 May 2006 14:17:44 -0000 1.44 --- makefile.wat 20 May 2006 18:22:26 -0000 1.45 *************** *** 697,700 **** --- 697,701 ---- watcom$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_data.obj & + watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj & *************** *** 733,736 **** --- 734,738 ---- watcom$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_data.obj & + watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj & *************** *** 1436,1439 **** --- 1438,1444 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< *************** *** 1523,1526 **** --- 1528,1534 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.gcc 20 May 2006 14:17:44 -0000 1.45 --- makefile.gcc 20 May 2006 18:22:26 -0000 1.46 *************** *** 249,252 **** --- 249,253 ---- mingw$(WXLIBPOSTFIX)\wxbind_lib_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_data.o \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_mdi.o \ *************** *** 285,288 **** --- 286,290 ---- mingw$(WXLIBPOSTFIX)\wxbind_dll_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_data.o \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_mdi.o \ *************** *** 1290,1293 **** --- 1292,1298 ---- $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o: ../../wxbind/src/html.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 1377,1380 **** --- 1382,1388 ---- $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o: ../../wxbind/src/html.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:22:29
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24910/modules Modified Files: Makefile.in Log Message: readded html.cpp to wxbind module - was removed by mistake Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** Makefile.in 20 May 2006 14:17:43 -0000 1.38 --- Makefile.in 20 May 2006 18:22:25 -0000 1.39 *************** *** 209,212 **** --- 209,213 ---- wxbind_lib_geometry.o \ wxbind_lib_data.o \ + wxbind_lib_html.o \ wxbind_lib_grid.o \ wxbind_lib_mdi.o \ *************** *** 242,245 **** --- 243,247 ---- wxbind_dll_geometry.o \ wxbind_dll_data.o \ + wxbind_dll_html.o \ wxbind_dll_grid.o \ wxbind_dll_mdi.o \ *************** *** 975,979 **** @COND_SHARED_0@install_wxbind_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxbind/include/wxlprint.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 977,981 ---- @COND_SHARED_0@install_wxbind_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxbind/include/wxlprint.h wxbind/include/wxbinddefs.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 983,987 **** @COND_SHARED_0@uninstall_wxbind_lib_headers: ! @COND_SHARED_0@ for f in wxbind/include/wxlprint.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done --- 985,989 ---- @COND_SHARED_0@uninstall_wxbind_lib_headers: ! @COND_SHARED_0@ for f in wxbind/include/wxlprint.h wxbind/include/wxbinddefs.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done *************** *** 1004,1008 **** @COND_SHARED_1@install_wxbind_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxbind/include/wxlprint.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1006,1010 ---- @COND_SHARED_1@install_wxbind_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxbind/include/wxlprint.h wxbind/include/wxbinddefs.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1012,1016 **** @COND_SHARED_1@uninstall_wxbind_dll_headers: ! @COND_SHARED_1@ for f in wxbind/include/wxlprint.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done --- 1014,1018 ---- @COND_SHARED_1@uninstall_wxbind_dll_headers: ! @COND_SHARED_1@ for f in wxbind/include/wxlprint.h wxbind/include/wxbinddefs.h wxbind/include/wxlhtmlwin.h wxbind/include/wxbind.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done *************** *** 1193,1197 **** @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/wxlua.cpp wxbind/src/xml.cpp wxbind/src/geometry.cpp wxbind/src/data.cpp wxbind/src/grid.cpp wxbind/src/mdi.cpp wxbind/src/file.cpp wxbind/src/config.cpp wxbind/src/menutool.cpp wxbind/src/event.cpp wxbind/src/gdi.cpp wxbind/src/wxlprint.cpp wxbind/src/defsutil.cpp wxbind/src/image.cpp wxbind/src/sizer.cpp wxbind/src/wave.cpp wxbind/src/socket.cpp wxbind/src/wx_bind.cpp wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/appframe.cpp wxbind/src/regex.cpp wxbind/src/controls.cpp wxbind/src/datetime.cpp wxbind/src/dialogs.cpp wxbind/src/clipdrag.cpp wxbind/src/print.cpp wxbind/src/thread.cpp wxbind/src/help.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ --- 1195,1199 ---- @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/wxlua.cpp wxbind/src/xml.cpp wxbind/src/geometry.cpp wxbind/src/data.cpp wxbind/src/html.cpp wxbind/src/grid.cpp wxbind/src/mdi.cpp wxbind/src/file.cpp wxbind/src/config.cpp wxbind/src/menutool.cpp wxbind/src/event.cpp wxbind/src/gdi.cpp wxbind/src/wxlprint.cpp wxbind/src/defsutil.cpp wxbind/src/image.cpp wxbind/src/sizer.cpp wxbind/src/wave.cpp wxbind/src/socket.cpp wxbind/src/wx_bind.cpp wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/appframe.cpp wxbind/src/regex.cpp wxbind/src/controls.cpp wxbind/src/datetime.cpp wxbind/src/dialogs.cpp wxbind/src/clipdrag.cpp wxbind/src/print.cpp wxbind/src/thread.cpp wxbind/src/help.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ *************** *** 1611,1614 **** --- 1613,1619 ---- $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/data.cpp + wxbind_lib_html.o: $(top_srcdir)/modules/wxbind/src/html.cpp + $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/html.cpp + wxbind_lib_grid.o: $(top_srcdir)/modules/wxbind/src/grid.cpp $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/grid.cpp *************** *** 1698,1701 **** --- 1703,1709 ---- $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/data.cpp + wxbind_dll_html.o: $(top_srcdir)/modules/wxbind/src/html.cpp + $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/html.cpp + wxbind_dll_grid.o: $(top_srcdir)/modules/wxbind/src/grid.cpp $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/grid.cpp |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:09:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20002/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: added WXDLLIMPEXP_DATA_WXBIND symbol to wrapper generator Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxstc_datatypes.lua 17 May 2006 22:47:09 -0000 1.26 --- wxstc_datatypes.lua 20 May 2006 18:09:01 -0000 1.27 *************** *** 63,66 **** --- 63,71 ---- Name = "LPVOID", }, + LuaFunction = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "LuaFunction", + }, LuaTable = { DefType = "wxtypedef", |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:09:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20002/modules/wxbindstc/include Modified Files: wxbind.h Log Message: added WXDLLIMPEXP_DATA_WXBIND symbol to wrapper generator Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxbind.h 17 Apr 2006 22:46:25 -0000 1.6 --- wxbind.h 20 May 2006 18:09:01 -0000 1.7 *************** *** 36,42 **** // bind wxLuaBinding_wxstc to a single wxLuaState ! extern bool wxLuaBinding_wxstc_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxstc for all wxLuaStates ! extern bool wxLuaBinding_wxstc_init(); --- 36,42 ---- // bind wxLuaBinding_wxstc to a single wxLuaState ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wxstc_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxstc for all wxLuaStates ! extern WXDLLIMPEXP_DATA_WXBIND(bool) wxLuaBinding_wxstc_init(); *************** *** 49,54 **** #if wxLUA_USE_wxStyledTextCtrl ! extern int s_wxluatag_wxStyledTextCtrl; ! extern int s_wxluatag_wxStyledTextEvent; #endif --- 49,54 ---- #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStyledTextCtrl; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStyledTextEvent; #endif *************** *** 58,65 **** #if wxLUA_USE_wxStyledTextCtrl ! extern WXLUAMETHOD* wxStyledTextCtrl_methods; ! extern int wxStyledTextCtrl_methodCount; ! extern WXLUAMETHOD* wxStyledTextEvent_methods; ! extern int wxStyledTextEvent_methodCount; #endif --- 58,65 ---- #if wxLUA_USE_wxStyledTextCtrl ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStyledTextCtrl_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxStyledTextCtrl_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStyledTextEvent_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxStyledTextEvent_methodCount; #endif |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:09:05
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20002/bindings Modified Files: genwxbind.lua Log Message: added WXDLLIMPEXP_DATA_WXBIND symbol to wrapper generator Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** genwxbind.lua 18 May 2006 05:47:39 -0000 1.64 --- genwxbind.lua 20 May 2006 18:09:00 -0000 1.65 *************** *** 2966,2970 **** local objectTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2966,2970 ---- local objectTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3003,3007 **** local objectTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3003,3007 ---- local objectTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3039,3043 **** local eventTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3039,3043 ---- local eventTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3726,3732 **** local classTagBinding = { ! ExternDeclaration = "extern int s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern int "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } --- 3726,3732 ---- local classTagBinding = { ! ExternDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ! ExternMethodDeclaration = "extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern WXDLLIMPEXP_DATA_WXBIND(int) "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } *************** *** 3895,3901 **** table.insert(fileData, "// bind "..hook_cpp_binding_classname.." to a single wxLuaState\n") ! table.insert(fileData, "extern bool "..hook_cpp_binding_classname.."_bind(const wxLuaState& wxlState);\n") table.insert(fileData, "// initialize "..hook_cpp_binding_classname.." for all wxLuaStates\n") ! table.insert(fileData, "extern bool "..hook_cpp_binding_classname.."_init();\n\n") if hook_bind_condition then --- 3895,3901 ---- table.insert(fileData, "// bind "..hook_cpp_binding_classname.." to a single wxLuaState\n") ! table.insert(fileData, "extern WXDLLIMPEXP_DATA_WXBIND(bool) "..hook_cpp_binding_classname.."_bind(const wxLuaState& wxlState);\n") table.insert(fileData, "// initialize "..hook_cpp_binding_classname.." for all wxLuaStates\n") ! table.insert(fileData, "extern WXDLLIMPEXP_DATA_WXBIND(bool) "..hook_cpp_binding_classname.."_init();\n\n") if hook_bind_condition then |
|
From: Francesco M. <fr...@us...> - 2006-05-20 18:09:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20002/modules/wxbind/include Modified Files: wxbind.h Log Message: added WXDLLIMPEXP_DATA_WXBIND symbol to wrapper generator Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxbind.h 17 May 2006 05:02:05 -0000 1.27 --- wxbind.h 20 May 2006 18:09:01 -0000 1.28 *************** *** 36,42 **** // bind wxLuaBinding_wx to a single wxLuaState ! extern bool wxLuaBinding_wx_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wx for all wxLuaStates ! extern bool wxLuaBinding_wx_init(); --- 36,42 ---- // bind wxLuaBinding_wx to a single wxLuaState [...4309 lines suppressed...] ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxXmlResource_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxXmlResource_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxXmlResourceHandler_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxXmlResourceHandler_methodCount; #endif #if wxUSE_STREAMS ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFileInputStream_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileInputStream_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxFileOutputStream_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileOutputStream_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxInputStream_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxInputStream_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxOutputStream_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxOutputStream_methodCount; ! extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxStreamBase_methods; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxStreamBase_methodCount; #endif |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:17:51
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32690/modules/build/bakefiles Modified Files: modules.bkl Log Message: added STC to wxBindSTC dll linkstage Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** modules.bkl 20 May 2006 13:12:34 -0000 1.32 --- modules.bkl 20 May 2006 14:17:44 -0000 1.33 *************** *** 120,123 **** --- 120,124 ---- <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> + <wx-lib>stc</wx-lib> </wxlua_stddll> |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:17:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32690/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp Log Message: added STC to wxBindSTC dll linkstage Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.bcc 20 May 2006 13:12:34 -0000 1.44 --- makefile.bcc 20 May 2006 14:17:44 -0000 1.45 *************** *** 291,295 **** borland$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ - borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ --- 291,294 ---- *************** *** 328,332 **** borland$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ - borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ --- 327,330 ---- *************** *** 795,799 **** ..\..\..\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) 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 $@ --- 793,797 ---- ..\..\..\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 $@ *************** *** 1223,1229 **** $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1221,1224 ---- *************** *** 1313,1319 **** $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** --- 1308,1311 ---- Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** modules_mod_wxbind.dsp 20 May 2006 13:12:35 -0000 1.25 --- modules_mod_wxbind.dsp 20 May 2006 14:17:44 -0000 1.26 *************** *** 509,516 **** # Begin Source File - SOURCE=..\..\wxbind\src\html.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxbind\src\image.cpp # End Source File --- 509,512 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.wat 20 May 2006 13:12:34 -0000 1.43 --- makefile.wat 20 May 2006 14:17:44 -0000 1.44 *************** *** 697,701 **** watcom$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_data.obj & - watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj & --- 697,700 ---- *************** *** 734,738 **** watcom$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_data.obj & - watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj & --- 733,736 ---- *************** *** 978,982 **** @%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) 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 --- 976,980 ---- @%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 *************** *** 1438,1444 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< --- 1436,1439 ---- *************** *** 1528,1534 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< --- 1523,1526 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.gcc 20 May 2006 13:12:34 -0000 1.44 --- makefile.gcc 20 May 2006 14:17:44 -0000 1.45 *************** *** 249,253 **** mingw$(WXLIBPOSTFIX)\wxbind_lib_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_data.o \ - mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_mdi.o \ --- 249,252 ---- *************** *** 286,290 **** mingw$(WXLIBPOSTFIX)\wxbind_dll_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_data.o \ - mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_mdi.o \ --- 285,288 ---- *************** *** 865,869 **** 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) -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 --- 863,867 ---- 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 *************** *** 1292,1298 **** $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o: ../../wxbind/src/html.cpp - $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1290,1293 ---- *************** *** 1382,1388 **** $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o: ../../wxbind/src/html.cpp - $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1377,1380 ---- Index: modules_mod_wxbindstc.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbindstc.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** modules_mod_wxbindstc.dsp 20 May 2006 13:12:35 -0000 1.14 --- modules_mod_wxbindstc.dsp 20 May 2006 14:17:44 -0000 1.15 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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_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 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_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" *************** *** 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 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 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_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" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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_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 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_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" *************** *** 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 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 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_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" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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_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 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_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" *************** *** 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 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 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_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" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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_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 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" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Multilib" --- 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.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" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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_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 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_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 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 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 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.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" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Unicode Debug Monolithic" Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.vc 20 May 2006 13:12:34 -0000 1.43 --- makefile.vc 20 May 2006 14:17:44 -0000 1.44 *************** *** 272,276 **** msvc$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ - msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ --- 272,275 ---- *************** *** 312,316 **** msvc$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ - msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ --- 311,314 ---- *************** *** 792,796 **** ..\..\..\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) 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 --- 790,794 ---- ..\..\..\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 *************** *** 1217,1223 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1215,1218 ---- *************** *** 1307,1313 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** --- 1302,1305 ---- |
