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-02-03 16:51:46
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18016/modules Modified Files: Makefile.in Log Message: now wxbindcustom makefiles work on Unix Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile.in 3 Feb 2006 15:42:54 -0000 1.22 --- Makefile.in 3 Feb 2006 16:51:38 -0000 1.23 *************** *** 493,497 **** all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) wxbindsrc wxbindmake uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) --- 493,497 ---- all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) wxbindsrc wxbindmake wxbindsetup uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) *************** *** 871,874 **** --- 871,886 ---- done + wxbindsetup: + @mkdir -p $(includedir)/wxbind/setup + @for f in wxbind/setup/wxluasetup.h; do \ + if test ! -f $(includedir)/wxbind/setup/$$f -a ! -d $(includedir)/wxbind/setup/$$f ; \ + then x=yep ; \ + else x=`find $(top_srcdir)/modules/$$f -newer $(includedir)/wxbind/setup/$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(top_srcdir)/modules/$$f $(includedir)/wxbind/setup ;; \ + esac; \ + done + mod_lua_lib_lundump.o: $(top_srcdir)/modules/lua/src/lundump.c $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(top_srcdir)/modules/lua/src/lundump.c *************** *** 1298,1300 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers wxbindsrc wxbindmake --- 1310,1312 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers wxbindsrc wxbindmake wxbindsetup |
|
From: Francesco M. <fr...@us...> - 2006-02-03 16:51:46
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18016/modules/build/bakefiles Modified Files: modules.bkl Log Message: now wxbindcustom makefiles work on Unix Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** modules.bkl 3 Feb 2006 15:42:54 -0000 1.19 --- modules.bkl 3 Feb 2006 16:51:38 -0000 1.20 *************** *** 149,152 **** --- 149,158 ---- <files>$(fileList('wxbind/build/makefile*'))</files> </copy-files> + <copy-files id="wxbindsetup"> + <dependency-of>install</dependency-of> + <srcdir>$(top_srcdir)/modules</srcdir> + <dstdir>$(INCLUDEDIR)/wxbind/setup</dstdir> + <files>wxbind/setup/wxluasetup.h</files> + </copy-files> </if> |
|
From: John L. <jr...@us...> - 2006-02-03 15:59:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26764/wxLua/modules/wxbind/src Modified Files: wx_builtin.cpp Log Message: make genwxbind.bat for wxstc nicer fix for empty arrays, fixes previous fix to empty builtin function array compilation error Index: wx_builtin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_builtin.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_builtin.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wx_builtin.cpp 3 Feb 2006 15:59:27 -0000 1.2 *************** *** 1903,1908 **** #endif }; ! count = (sizeof(builtinList)/sizeof(builtinList[0])); return builtinList; } --- 1903,1909 ---- #endif + { LuaGlobal, 0, 0, 0, 0 }, }; ! count = (sizeof(builtinList)/sizeof(builtinList[0])) - 1; return builtinList; } |
|
From: John L. <jr...@us...> - 2006-02-03 15:59:37
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26764/wxLua/bindings Modified Files: genwxbind.bat genwxbind.lua Log Message: make genwxbind.bat for wxstc nicer fix for empty arrays, fixes previous fix to empty builtin function array compilation error Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** genwxbind.bat 2 Feb 2006 15:49:24 -0000 1.3 --- genwxbind.bat 3 Feb 2006 15:59:27 -0000 1.4 *************** *** 6,10 **** echo Generating wxWidgets Binding %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt ! %LUA% -e"rulesFilename=\"wxwidgets/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt echo Done. --- 6,10 ---- echo Generating wxWidgets Binding %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt ! %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt echo Done. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** genwxbind.lua 3 Feb 2006 15:18:04 -0000 1.21 --- genwxbind.lua 3 Feb 2006 15:59:27 -0000 1.22 *************** *** 4120,4150 **** -- /////////////////////////////////////////////////////////////////////// table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n") ! if table.getn(builtinBindingTable) == 0 then ! table.insert(fileData, " count = 0;\n") ! table.insert(fileData, " return NULL;\n") ! else ! table.insert(fileData, " static WXLUAMETHOD builtinList[] =\n {\n") ! ! for condition, builtinBindingList in builtinBindingTable do ! if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") ! end ! for idx, builtinBinding in builtinBindingList do ! table.insert(fileData, builtinBinding.Map) ! end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") ! end end end - - table.insert(fileData, " };\n") - table.insert(fileData, " count = (sizeof(builtinList)/sizeof(builtinList[0]));\n") - table.insert(fileData, " return builtinList;\n") end table.insert(fileData, "}\n\n") --- 4120,4145 ---- -- /////////////////////////////////////////////////////////////////////// table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n") + table.insert(fileData, " static WXLUAMETHOD builtinList[] =\n {\n") ! for condition, builtinBindingList in builtinBindingTable do ! if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") ! end ! for idx, builtinBinding in builtinBindingList do ! table.insert(fileData, builtinBinding.Map) ! end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end end + + table.insert(fileData, " { LuaGlobal, 0, 0, 0, 0 }, \n") + table.insert(fileData, " };\n") + table.insert(fileData, " count = (sizeof(builtinList)/sizeof(builtinList[0])) - 1;\n") + table.insert(fileData, " return builtinList;\n") table.insert(fileData, "}\n\n") |
|
From: John L. <jr...@us...> - 2006-02-03 15:59:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26764/wxLua/modules/wxbindstc/src Modified Files: wxstc_builtin.cpp Log Message: make genwxbind.bat for wxstc nicer fix for empty arrays, fixes previous fix to empty builtin function array compilation error Index: wxstc_builtin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_builtin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxstc_builtin.cpp 3 Feb 2006 15:18:05 -0000 1.2 --- wxstc_builtin.cpp 3 Feb 2006 15:59:27 -0000 1.3 *************** *** 29,34 **** WXLUAMETHOD* wxLuaGetBuiltinList_wxstc(size_t &count) { ! count = 0; ! return NULL; } --- 29,38 ---- WXLUAMETHOD* wxLuaGetBuiltinList_wxstc(size_t &count) { ! static WXLUAMETHOD builtinList[] = ! { ! { LuaGlobal, 0, 0, 0, 0 }, ! }; ! count = (sizeof(builtinList)/sizeof(builtinList[0])) - 1; ! return builtinList; } |
|
From: Francesco M. <fr...@us...> - 2006-02-03 15:43:06
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20651/build/bakefiles Modified Files: wxhacks.bkl Log Message: Added install rules for wxBind sources and makefiles Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxhacks.bkl 2 Feb 2006 18:46:43 -0000 1.4 --- wxhacks.bkl 3 Feb 2006 15:42:54 -0000 1.5 *************** *** 52,72 **** http://sourceforge.net/tracker/index.php?func=detail&aid=1254557&group_id=9863&atid=309863 - wxCode bakefiles don't use its own options (BUILD,UNICODE,SHARED) and then sets WX_* options from - their values; since wxCode components are "wx addons" we will use directly the WX_* options. - Thus we need them also on Unix formats and thus we declare them here. All these options are set (for 'autoconf' format) by the AM_WXPRESETS macro ! (see wxpresets.m4 and wxcode.m4 macro files). --> ! <option name="WX_DEBUG"/> ! <option name="WX_UNICODE"/> ! <option name="WX_SHARED"/> ! <option name="WX_DIR"/> ! <option name="WX_VERSION"/> ! <option name="WX_PORT"/> <!-- these option values are available only with autoconf (and using wxpresets.m4) --> ! <option name="WX_VERSION_MAJOR"/> ! <option name="WX_VERSION_MINOR"/> ! <option name="WX_GTKPORT_VERSION"/> </if> <if cond="TARGETING_WIN32=='1'"> --- 52,149 ---- http://sourceforge.net/tracker/index.php?func=detail&aid=1254557&group_id=9863&atid=309863 All these options are set (for 'autoconf' format) by the AM_WXPRESETS macro ! (see wxpresets.m4). ! The option descriptions, values and default-values tags are used only by the GNU format (currently). --> ! ! <!-- The directory where wxWidgets is installed: --> ! <if cond="not isdefined('WX_DIR')"> ! <set var="WX_DIR_DEFAULT" overwrite="0">`wx-config --prefix`</set> ! <option name="WX_DIR" category="path"> ! <default-value>$(WX_DIR_DEFAULT)</default-value> ! <description> ! The directory where wxWidgets library is installed ! </description> ! </option> ! </if> ! ! <!-- This is a standard option that determines --> ! <!-- whether the user wants to build this library as --> ! <!-- a dll or as a static library. --> ! <if cond="not isdefined('WX_SHARED')"> ! <set var="WX_SHARED_DEFAULT" overwrite="0">0</set> ! <option name="WX_SHARED"> ! <values>0,1</values> ! <values-description>,DLL</values-description> ! <default-value>$(WX_SHARED_DEFAULT)</default-value> ! <description> ! Use DLL build of wx library to use? ! </description> ! </option> ! </if> ! ! <!-- Configuration for building the bakefile with --> ! <!-- unicode strings or not (unicode or ansi). --> ! <if cond="not isdefined('WX_UNICODE')"> ! <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set> ! <option name="WX_UNICODE"> ! <values>0,1</values> ! <values-description>,Unicode</values-description> ! <default-value>$(WX_UNICODE_DEFAULT)</default-value> ! <description> ! Compile Unicode build of wxWidgets? ! </description> ! </option> ! </if> ! ! <if cond="not isdefined('WX_DEBUG')"> ! <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set> ! <option name="WX_DEBUG"> ! <values>0,1</values> ! <values-description>Release,Debug</values-description> ! <default-value>$(WX_DEBUG_DEFAULT)</default-value> ! <description> ! Use debug build of wxWidgets (define __WXDEBUG__)? ! </description> ! </option> ! </if> ! ! <if cond="not isdefined('WX_VERSION')"> ! <set var="WX_VERSION_DEFAULT" overwrite="0">27</set> ! <option name="WX_VERSION"> ! <default-value>$(WX_VERSION_DEFAULT)</default-value> ! <description> ! Version of the wx library to build against. ! </description> ! </option> ! </if> ! ! <if cond="not isdefined('WX_PORT')"> ! <set var="WX_PORT_DEFAULT" overwrite="0">gtk</set> ! <option name="WX_PORT"> ! <default-value>$(WX_PORT_DEFAULT)</default-value> ! <description> ! Port of the wx library to build against (wxGTK, wxMac, wxMSW, etc). ! </description> ! </option> ! </if> ! <!-- these option values are available only with autoconf (and using wxpresets.m4) --> ! <option name="WX_VERSION_MAJOR"> ! <values>2,3</values> ! <default-value>2</default-value> ! <description>wxWidgets major version number</description> ! </option> ! <option name="WX_VERSION_MINOR"> ! <values>1,2,3,4,5,6,7,8,9,0</values> ! <default-value>6</default-value> ! <description>wxWidgets minor version number</description> ! </option> ! <option name="WX_GTKPORT_VERSION"> ! <values>1,2</values> ! <default-value>2</default-value> ! <description>The version of GTK+ library used by wxWidgets</description> ! </option> </if> <if cond="TARGETING_WIN32=='1'"> |
|
From: Francesco M. <fr...@us...> - 2006-02-03 15:43:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20651/modules/wxbind/build Modified Files: makefile.gnu wxbindcustom.bkl Log Message: Added install rules for wxBind sources and makefiles Index: wxbindcustom.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/wxbindcustom.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxbindcustom.bkl 2 Feb 2006 23:02:29 -0000 1.1 --- wxbindcustom.bkl 3 Feb 2006 15:42:54 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" ?> ! <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id$ --> --- 1,5 ---- <?xml version="1.0" ?> ! <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id$ --> Index: makefile.gnu =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.gnu,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.gnu 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.gnu 3 Feb 2006 15:42:54 -0000 1.2 *************** *** 44,58 **** WX_LIBS = `$(WX_CONFIG) --libs` ! # ! WX_SHARED = ! # ! WX_PORT = ! # ! WX_VERSION_MAJOR = ! # ! WX_VERSION_MINOR = # The folder where user's custom wxluasetup.h is searched --- 44,58 ---- WX_LIBS = `$(WX_CONFIG) --libs` ! # Use DLL build of wx library to use? [0,1] ! WX_SHARED = 0 ! # Port of the wx library to build against (wxGTK, wxMac, wxMSW, etc). ! WX_PORT = gtk ! # wxWidgets major version number [2,3] ! WX_VERSION_MAJOR = 2 ! # wxWidgets minor version number [1,2,3,4,5,6,7,8,9,0] ! WX_VERSION_MINOR = 6 # The folder where user's custom wxluasetup.h is searched |
|
From: Francesco M. <fr...@us...> - 2006-02-03 15:43:03
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20651/modules Modified Files: Makefile.in Log Message: Added install rules for wxBind sources and makefiles Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 2 Feb 2006 23:02:29 -0000 1.21 --- Makefile.in 3 Feb 2006 15:42:54 -0000 1.22 *************** *** 493,497 **** all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) --- 493,497 ---- all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) wxbindsrc wxbindmake uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) *************** *** 847,850 **** --- 847,874 ---- @COND_WX_SHARED_1@ done + wxbindsrc: + @mkdir -p $(includedir)/wxbind/src + @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/wx_object.cpp wxbind/src/menutool.cpp wxbind/src/event.cpp wxbind/src/gdi.cpp wxbind/src/wxlprint.cpp wxbind/src/fl.cpp wxbind/src/defsutil.cpp wxbind/src/image.cpp wxbind/src/sizer.cpp wxbind/src/wave.cpp wxbind/src/socket.cpp wxbind/src/wx_event.cpp wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/wx_define.cpp wxbind/src/appframe.cpp wxbind/src/regex.cpp wxbind/src/wx_builtin.cpp wxbind/src/controls.cpp wxbind/src/wx_class.cpp wxbind/src/plot.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 \ + if test ! -f $(includedir)/wxbind/src/$$f -a ! -d $(includedir)/wxbind/src/$$f ; \ + then x=yep ; \ + else x=`find $(top_srcdir)/modules/$$f -newer $(includedir)/wxbind/src/$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(top_srcdir)/modules/$$f $(includedir)/wxbind/src ;; \ + esac; \ + done + + wxbindmake: + @mkdir -p $(includedir)/wxbind/build + @for f in wxbind/build/makefile.bcc wxbind/build/makefile.gcc wxbind/build/makefile.gnu wxbind/build/makefile.wat wxbind/build/makefile.vc; do \ + if test ! -f $(includedir)/wxbind/build/$$f -a ! -d $(includedir)/wxbind/build/$$f ; \ + then x=yep ; \ + else x=`find $(top_srcdir)/modules/$$f -newer $(includedir)/wxbind/build/$$f -print` ; \ + fi; \ + case "$$x" in ?*) \ + cp -pRf $(top_srcdir)/modules/$$f $(includedir)/wxbind/build ;; \ + esac; \ + done + mod_lua_lib_lundump.o: $(top_srcdir)/modules/lua/src/lundump.c $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(top_srcdir)/modules/lua/src/lundump.c *************** *** 1274,1276 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers --- 1298,1300 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers wxbindsrc wxbindmake |
|
From: Francesco M. <fr...@us...> - 2006-02-03 15:43:03
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20651/modules/build/bakefiles Modified Files: modules.bkl Log Message: Added install rules for wxBind sources and makefiles Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** modules.bkl 2 Feb 2006 23:02:29 -0000 1.18 --- modules.bkl 3 Feb 2006 15:42:54 -0000 1.19 *************** *** 131,133 **** --- 131,153 ---- </set> + + <!-- Additionally, we need also to install wxBind's sources and the makefiles to compile + it in case some other app want to extend them... (see modules/wxbind/build/wxbindcustom.bkl) + --> + <if cond="TARGETING_UNIX=='1'"> + + <copy-files id="wxbindsrc"> + <dependency-of>install</dependency-of> + <srcdir>$(top_srcdir)/modules</srcdir> + <dstdir>$(INCLUDEDIR)/wxbind/src</dstdir> + <files>$(WXBIND_SRC)</files> + </copy-files> + <copy-files id="wxbindmake"> + <dependency-of>install</dependency-of> + <srcdir>$(top_srcdir)/modules</srcdir> + <dstdir>$(INCLUDEDIR)/wxbind/build</dstdir> + <files>$(fileList('wxbind/build/makefile*'))</files> + </copy-files> + </if> + </makefile> |
|
From: John L. <jr...@us...> - 2006-02-03 15:18:14
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11214/wxLua/bindings Modified Files: genwxbind.lua Log Message: fix genwxbind to just return NULL for builtin functions when there's none Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** genwxbind.lua 3 Feb 2006 04:53:57 -0000 1.20 --- genwxbind.lua 3 Feb 2006 15:18:04 -0000 1.21 *************** *** 4120,4144 **** -- /////////////////////////////////////////////////////////////////////// table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n") - table.insert(fileData, " static WXLUAMETHOD builtinList[] =\n {\n") ! for condition, builtinBindingList in builtinBindingTable do ! if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") ! end ! for idx, builtinBinding in builtinBindingList do ! table.insert(fileData, builtinBinding.Map) ! end ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") end end - end ! table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(builtinList)/sizeof(builtinList[0]));\n") ! table.insert(fileData, " return builtinList;\n") table.insert(fileData, "}\n\n") --- 4120,4150 ---- -- /////////////////////////////////////////////////////////////////////// table.insert(fileData, "WXLUAMETHOD* "..hook_builtin_fn.."(size_t &count)\n{\n") ! if table.getn(builtinBindingTable) == 0 then ! table.insert(fileData, " count = 0;\n") ! table.insert(fileData, " return NULL;\n") ! else ! table.insert(fileData, " static WXLUAMETHOD builtinList[] =\n {\n") ! for condition, builtinBindingList in builtinBindingTable do ! if condition ~= nil and condition ~= "n" and condition ~= "" and builtinBindingList then ! if condition ~= "1" then ! table.insert(fileData, "\n#if "..condition.."\n") ! end ! for idx, builtinBinding in builtinBindingList do ! table.insert(fileData, builtinBinding.Map) ! end ! ! if condition ~= "1" then ! table.insert(fileData, "#endif\n\n") ! end end end ! table.insert(fileData, " };\n") ! table.insert(fileData, " count = (sizeof(builtinList)/sizeof(builtinList[0]));\n") ! table.insert(fileData, " return builtinList;\n") ! end table.insert(fileData, "}\n\n") |
|
From: John L. <jr...@us...> - 2006-02-03 15:18:14
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11214/wxLua/bindings/wxstc Modified Files: Makefile Log Message: fix genwxbind to just return NULL for builtin functions when there's none Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 2 Feb 2006 17:05:41 -0000 1.2 --- Makefile 3 Feb 2006 15:18:05 -0000 1.3 *************** *** 13,17 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=wxluasetup.h.in $(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxstc/override.hpp # $(THEWRAPPERS) all: genwxbind --- 13,17 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxstc/override.hpp # $(THEWRAPPERS) all: genwxbind |
|
From: John L. <jr...@us...> - 2006-02-03 15:18:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11214/wxLua/modules/wxbindstc/src Modified Files: wxstc_builtin.cpp Log Message: fix genwxbind to just return NULL for builtin functions when there's none Index: wxstc_builtin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_builtin.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_builtin.cpp 2 Feb 2006 16:11:33 -0000 1.1 --- wxstc_builtin.cpp 3 Feb 2006 15:18:05 -0000 1.2 *************** *** 29,37 **** WXLUAMETHOD* wxLuaGetBuiltinList_wxstc(size_t &count) { ! static WXLUAMETHOD builtinList[] = ! { ! }; ! count = (sizeof(builtinList)/sizeof(builtinList[0])); ! return builtinList; } --- 29,34 ---- WXLUAMETHOD* wxLuaGetBuiltinList_wxstc(size_t &count) { ! count = 0; ! return NULL; } |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/modules/wxlua/include Modified Files: internal.h Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** internal.h 23 Jan 2006 04:38:29 -0000 1.18 --- internal.h 3 Feb 2006 04:53:58 -0000 1.19 *************** *** 29,37 **** // with standard lua functions. - #define wxFileRead read // FIXME see file.i and wx_define.cpp need to remove these - #define wxFileWrite write - #define wxFileReadWrite read_write - #define wxFileWriteAppend write_append - //#define wxDataObjectGet wxDataObject::Get //#define wxDataObjectSet wxDataObject::Set --- 29,32 ---- *************** *** 235,239 **** // global function in Lua for wiring int LUACALL wxEvtHandler_ConnectEvent(lua_State *L); ! //int LUACALL wxEvtHandler_DisconnectEvent(lua_State *L); // get the method or 'get' property for the class at cpIndex --- 230,234 ---- // global function in Lua for wiring int LUACALL wxEvtHandler_ConnectEvent(lua_State *L); ! //int LUACALL wxEvtHandler_DisconnectEvent(lua_State *L); // FIXME implement this eventually // get the method or 'get' property for the class at cpIndex *************** *** 336,342 **** }; - // ---------------------------------------------------------------------------- - // Used to create a set of standard bitmaps for wxLua - int LUACALL CreateStandaloneBitmaps(lua_State *luaState); - #endif // WX_LUA_INTERNALS_H --- 331,333 ---- |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:06
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/apps/wxlua/src Modified Files: lconsole.cpp wxlua.cpp wxlua.h Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlua.cpp 29 Jan 2006 15:45:39 -0000 1.13 --- wxlua.cpp 3 Feb 2006 04:53:57 -0000 1.14 *************** *** 35,39 **** #include "wxluadebug/include/splttree.h" #include "wxluadebug/include/staktree.h" ! #endif #include "art/wxluasmall.xpm" --- 35,39 ---- #include "wxluadebug/include/splttree.h" #include "wxluadebug/include/staktree.h" ! #endif // wxCHECK_VERSION(2, 3, 0) #include "art/wxluasmall.xpm" *************** *** 48,51 **** --- 48,118 ---- // --------------------------------------------------------------------------- + // CreateStandaloneBitmaps + // --------------------------------------------------------------------------- + + extern int s_wxluatag_wxBitmap; // declared in wxbind module + + int LUACALL CreateStandaloneBitmaps(lua_State *L) + { + #include "art/new.xpm" + #include "art/open.xpm" + #include "art/save.xpm" + #include "art/saveall.xpm" + #include "art/cut.xpm" + #include "art/copy.xpm" + #include "art/paste.xpm" + #include "art/help.xpm" + + wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua")); + + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + wxBitmap *returns; + + returns = new wxBitmap(new_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "newBitmap"); + + returns = new wxBitmap(open_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "openBitmap"); + + returns = new wxBitmap(save_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "saveBitmap"); + + returns = new wxBitmap(saveall_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "saveAllBitmap"); + + returns = new wxBitmap(cut_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "cutBitmap"); + + returns = new wxBitmap(copy_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "copyBitmap"); + + returns = new wxBitmap(paste_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "pasteBitmap"); + + returns = new wxBitmap(help_xpm); + wxlState.addToTrackedMemoryList(returns); + wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); + lua_setglobal(L, "helpBitmap"); + + return 0; + } + + // --------------------------------------------------------------------------- // LuaHandler - routes commands from the wxLuaHandler to the app // --------------------------------------------------------------------------- *************** *** 91,99 **** BEGIN_EVENT_TABLE(wxLuaStandaloneApp, wxApp) ! EVT_LUA_CONSOLE (-1, wxLuaStandaloneApp::OnLua) ! EVT_LUA_WARNING (-1, wxLuaStandaloneApp::OnLua) ! EVT_LUA_ERROR (-1, wxLuaStandaloneApp::OnLua) ! EVT_LUA_DEBUG_HOOK (-1, wxLuaStandaloneApp::OnLua) ! EVT_LUA_SHUTDOWN (-1, wxLuaStandaloneApp::OnLua) EVT_WXLUA_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum) EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum) --- 158,166 ---- BEGIN_EVENT_TABLE(wxLuaStandaloneApp, wxApp) ! EVT_LUA_CONSOLE (wxID_ANY, wxLuaStandaloneApp::OnLua) ! EVT_LUA_WARNING (wxID_ANY, wxLuaStandaloneApp::OnLua) ! EVT_LUA_ERROR (wxID_ANY, wxLuaStandaloneApp::OnLua) ! EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaStandaloneApp::OnLua) ! EVT_LUA_SHUTDOWN (wxID_ANY, wxLuaStandaloneApp::OnLua) EVT_WXLUA_DEBUG_STACK_ENUM(wxLuaStandaloneApp::OnDebugStackEnum) EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum) *************** *** 112,116 **** WORD wVersionRequested = MAKEWORD(1, 1); WSAStartup(wVersionRequested, &wsaData); ! #endif g_strProgramName = argv[0]; --- 179,183 ---- WORD wVersionRequested = MAKEWORD(1, 1); WSAStartup(wVersionRequested, &wsaData); ! #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) g_strProgramName = argv[0]; *************** *** 120,127 **** #if wxCHECK_VERSION(2, 3, 0) m_pDebugTarget = NULL; ! #endif #ifdef __WXMSW__ m_pConsole = NULL; ! #endif // Initialize lua --- 187,194 ---- #if wxCHECK_VERSION(2, 3, 0) m_pDebugTarget = NULL; ! #endif // wxCHECK_VERSION(2, 3, 0) #ifdef __WXMSW__ m_pConsole = NULL; ! #endif // __WXMSW__ // Initialize lua *************** *** 157,161 **** if (argc == 2 && *argv[1] == wxT('-')) { ! #if wxCHECK_VERSION(2, 3, 0) // Check if we are launched as a debuggee if (wxStrlen(argv[1]) > 2 && argv[1][1] == wxT('d')) --- 224,228 ---- if (argc == 2 && *argv[1] == wxT('-')) { ! #if wxCHECK_VERSION(2, 3, 0) // Check if we are launched as a debuggee if (wxStrlen(argv[1]) > 2 && argv[1][1] == wxT('d')) *************** *** 179,184 **** return FALSE; } ! #endif ! #ifdef __WXMSW__ // Check if we are to display the console if ((wxStrlen(argv[1]) == 2) && (argv[1][1] == wxT('c'))) --- 246,251 ---- return FALSE; } ! #endif // wxCHECK_VERSION(2, 3, 0) ! #ifdef __WXMSW__ // Check if we are to display the console if ((wxStrlen(argv[1]) == 2) && (argv[1][1] == wxT('c'))) *************** *** 196,200 **** } else ! #endif // See if a file has been specified that we are to edit if ((wxStrlen(argv[1]) > 2) && (argv[1][1] == wxT('e'))) --- 263,267 ---- } else ! #endif // __WXMSW__ // See if a file has been specified that we are to edit if ((wxStrlen(argv[1]) > 2) && (argv[1][1] == wxT('e'))) *************** *** 224,228 **** } else ! #endif // execute the program using argc, argv; for (int idx = 1; idx < argc; ++idx) --- 291,295 ---- } else ! #endif // wxCHECK_VERSION(2, 3, 0) || defined(__WXMSW__) // execute the program using argc, argv; for (int idx = 1; idx < argc; ++idx) *************** *** 236,240 **** } else ! #endif // See if we are to run the specified file with command-line arguments. if (wxStrlen(argv[idx]) > 2 && argv[idx][0] == wxT('-') && argv[idx][1] == wxT('f')) --- 303,307 ---- } else ! #endif // __WXMSW__ // See if we are to run the specified file with command-line arguments. if (wxStrlen(argv[idx]) > 2 && argv[idx][0] == wxT('-') && argv[idx][1] == wxT('f')) *************** *** 294,298 **** #else return fOk; ! #endif } --- 361,365 ---- #else return fOk; ! #endif // __WXMSW__ } *************** *** 307,311 **** m_pDebugTarget = NULL; } ! #endif if (m_fMemoryBitmapAdded) --- 374,378 ---- m_pDebugTarget = NULL; } ! #endif // wxCHECK_VERSION(2, 3, 0) if (m_fMemoryBitmapAdded) *************** *** 322,326 **** #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) WSACleanup (); ! #endif return 0; --- 389,393 ---- #if defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) WSACleanup (); ! #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) return 0; *************** *** 338,342 **** #else wxPrintf(wxT("%s\n"), event.GetString().c_str()); ! #endif } else if (event.GetEventType() == wxEVT_LUA_ERROR) --- 405,409 ---- #else wxPrintf(wxT("%s\n"), event.GetString().c_str()); ! #endif // __WXMSW__ } else if (event.GetEventType() == wxEVT_LUA_ERROR) *************** *** 359,363 **** wxGetApp().SetStackFrame(NULL); pStackFrame->Destroy(); ! #endif return 0; } --- 426,430 ---- wxGetApp().SetStackFrame(NULL); pStackFrame->Destroy(); ! #endif // wxCHECK_VERSION(2, 3, 0) return 0; } *************** *** 399,403 **** #else fprintf(stderr, wx2lua(errorStr)); ! #endif } } --- 466,470 ---- #else fprintf(stderr, wx2lua(errorStr)); ! #endif // __WXMSW__ } } *************** *** 417,421 **** m_pStackFrame->FillStackCombobox(event.GetDebugData()); else ! #endif event.Skip(); } --- 484,488 ---- m_pStackFrame->FillStackCombobox(event.GetDebugData()); else ! #endif // wxCHECK_VERSION(2, 3, 0) event.Skip(); } *************** *** 427,431 **** m_pStackFrame->FillStackEntry(event.GetReference(), event.GetDebugData()); else ! #endif event.Skip(); } --- 494,498 ---- m_pStackFrame->FillStackEntry(event.GetReference(), event.GetDebugData()); else ! #endif // wxCHECK_VERSION(2, 3, 0) event.Skip(); } *************** *** 437,441 **** m_pStackFrame->FillTableEntry(wxTreeItemId((wxTreeItemIdValue)event.GetReference()), event.GetDebugData()); else ! #endif event.Skip(); } --- 504,508 ---- m_pStackFrame->FillTableEntry(wxTreeItemId((wxTreeItemIdValue)event.GetReference()), event.GetDebugData()); else ! #endif // wxCHECK_VERSION(2, 3, 0) event.Skip(); } Index: wxlua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlua.h 22 Dec 2005 18:42:33 -0000 1.9 --- wxlua.h 3 Feb 2006 04:53:57 -0000 1.10 *************** *** 47,51 **** #ifdef __WXMSW__ void SetLuaConsole(wxLuaConsole *pConsole) { m_pConsole = pConsole; } ! #endif void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_pStackFrame = pStackFrame; } --- 47,51 ---- #ifdef __WXMSW__ void SetLuaConsole(wxLuaConsole *pConsole) { m_pConsole = pConsole; } ! #endif // __WXMSW__ void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_pStackFrame = pStackFrame; } *************** *** 72,80 **** #ifdef __WXMSW__ wxLuaConsole *m_pConsole; ! #endif bool m_fMemoryBitmapAdded; #if wxCHECK_VERSION(2, 3, 0) ! wxLuaDebugTarget *m_pDebugTarget; ! #endif DECLARE_EVENT_TABLE(); --- 72,80 ---- #ifdef __WXMSW__ wxLuaConsole *m_pConsole; ! #endif // __WXMSW__ bool m_fMemoryBitmapAdded; #if wxCHECK_VERSION(2, 3, 0) ! wxLuaDebugTarget *m_pDebugTarget; ! #endif // wxCHECK_VERSION(2, 3, 0) DECLARE_EVENT_TABLE(); *************** *** 83,85 **** DECLARE_APP(wxLuaStandaloneApp) ! #endif --- 83,85 ---- DECLARE_APP(wxLuaStandaloneApp) ! #endif // WX_LUAAPP_H Index: lconsole.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/lconsole.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lconsole.cpp 29 Jan 2006 15:45:39 -0000 1.5 --- lconsole.cpp 3 Feb 2006 04:53:57 -0000 1.6 *************** *** 47,51 **** { m_listBox = new wxListBox( this, ! -1, wxPoint(0, 20), wxSize(0, 130), --- 47,51 ---- { m_listBox = new wxListBox( this, ! wxID_ANY, wxPoint(0, 20), wxSize(0, 130), *************** *** 115,119 **** wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState) ! : wxFrame(0, -1, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340)), m_pApp(pApp), m_fError(false) { --- 115,119 ---- wxLuaConsole::wxLuaConsole(wxLuaStandaloneApp *pApp, lua_State *pState) ! : wxFrame(0, wxID_ANY, wxT("wxLua Console"), wxPoint(0, 0), wxSize(250, 340)), m_pApp(pApp), m_fError(false) { *************** *** 125,134 **** m_splitter = new wxSplitterWindow(this, ! -1, wxPoint(0, 0), wxSize(0, 0), wxSP_3DSASH); m_textCtrl = new wxTextCtrl( m_splitter, ! -1, wxT(""), wxPoint(0, 0), --- 125,134 ---- m_splitter = new wxSplitterWindow(this, ! wxID_ANY, wxPoint(0, 0), wxSize(0, 0), wxSP_3DSASH); m_textCtrl = new wxTextCtrl( m_splitter, ! wxID_ANY, wxT(""), wxPoint(0, 0), |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:06
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/bindings/wxwidgets Modified Files: Makefile file.i Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 23 Jan 2006 04:38:29 -0000 1.3 --- Makefile 3 Feb 2006 04:53:57 -0000 1.4 *************** *** 13,17 **** include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=wxluasetup.h.in $(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind --- 13,17 ---- include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=$(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** file.i 18 Jun 2005 20:45:59 -0000 1.2 --- file.i 3 Feb 2006 04:53:57 -0000 1.3 *************** *** 37,41 **** %builtin bool wxSetWorkingDirectory(const wxString& dir) ! // These two methods are in overide.hpp %builtin wxString wxFileSeparator() %builtin long wxFileSize(const wxString& fileName) --- 37,41 ---- %builtin bool wxSetWorkingDirectory(const wxString& dir) ! // These two methods are in overide.hpp %builtin wxString wxFileSeparator() %builtin long wxFileSize(const wxString& fileName) *************** *** 161,168 **** %enum wxFile::OpenMode ! wxFileRead ! wxFileWrite ! wxFileReadWrite ! wxFileWriteAppend %endenum --- 161,168 ---- %enum wxFile::OpenMode ! %rename wxFileRead read ! %rename wxFileWrite write ! %rename wxFileReadWrite read_write ! %rename wxFileWriteAppend write_append %endenum |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/modules/wxbind/src Modified Files: Makefile wx_define.cpp Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: wx_define.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_define.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_define.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wx_define.cpp 3 Feb 2006 04:53:57 -0000 1.2 *************** *** 1280,1291 **** #if wxLUA_USE_wxFile ! { "wxFileWrite", false, wxFile::wxFileWrite, 0 }, { "wxFromStart", false, wxFromStart, 0 }, { "wxFromEnd", false, wxFromEnd, 0 }, { "wxFromCurrent", false, wxFromCurrent, 0 }, - { "wxFileWriteAppend", false, wxFile::wxFileWriteAppend, 0 }, { "wxInvalidOffset", false, wxInvalidOffset, 0 }, ! { "wxFileReadWrite", false, wxFile::wxFileReadWrite, 0 }, ! { "wxFileRead", false, wxFile::wxFileRead, 0 }, #endif --- 1280,1291 ---- #if wxLUA_USE_wxFile ! { "wxFileWrite", false, wxFile::write, 0 }, { "wxFromStart", false, wxFromStart, 0 }, { "wxFromEnd", false, wxFromEnd, 0 }, + { "wxFileRead", false, wxFile::read, 0 }, + { "wxFileReadWrite", false, wxFile::read_write, 0 }, { "wxFromCurrent", false, wxFromCurrent, 0 }, { "wxInvalidOffset", false, wxInvalidOffset, 0 }, ! { "wxFileWriteAppend", false, wxFile::write_append, 0 }, #endif Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 2 Feb 2006 15:49:24 -0000 1.6 --- Makefile 3 Feb 2006 04:53:57 -0000 1.7 *************** *** 38,42 **** CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) --- 38,42 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I../setup -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/modules/wxlua/src Modified Files: internal.cpp Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** internal.cpp 2 Feb 2006 20:07:13 -0000 1.27 --- internal.cpp 3 Feb 2006 04:53:58 -0000 1.28 *************** *** 32,49 **** #endif - #include "wx/datetime.h" - #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" #include "wxlua/include/wxlintrp.h" - #include "wxluadebug/include/wxldebug.h" // FIXME for wxLuaDebugData - - - //#ifdef FindText - //# undef FindText - //#endif - - extern int s_wxluatag_wxBitmap; extern int s_wxluatag_wxEvtHandler; --- 32,39 ---- *************** *** 486,489 **** --- 476,494 ---- } + // FIXME - this function copied from wxLuaDebugData to remove dependency + wxString wxLuaDebugData_MakeNumber(double dnum) + { + long num = (long) dnum; + if ((double) num == dnum) + { + if (num >= 0) + return wxString::Format(wxT("%lu (0x%lx)"), num, num); + + return wxString::Format(wxT("%ld (0x%lx)"), num, num); + } + + return wxString::Format(wxT("%g"), dnum); + } + void wxLuaCheckStack::DumpType(lua_State *L, int index, wxString& type, wxString& value, wxString& info) { *************** *** 506,510 **** case LUA_TNUMBER: type = wxT("Number"); ! value = wxLuaDebugData::MakeNumber(lua_tonumber(L, index)); break; --- 511,515 ---- case LUA_TNUMBER: type = wxT("Number"); ! value = wxLuaDebugData_MakeNumber(lua_tonumber(L, index)); break; *************** *** 1037,1040 **** --- 1042,1046 ---- int LUACALL wxEvtHandler_ConnectEvent(lua_State *L) { + wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); *************** *** 1161,1226 **** } - - int LUACALL CreateStandaloneBitmaps(lua_State *L) - { - #include "art/new.xpm" - #include "art/open.xpm" - #include "art/save.xpm" - #include "art/saveall.xpm" - #include "art/cut.xpm" - #include "art/copy.xpm" - #include "art/paste.xpm" - #include "art/help.xpm" - - wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua")); - - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - - wxBitmap *returns; - - returns = new wxBitmap(new_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "newBitmap"); - - returns = new wxBitmap(open_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "openBitmap"); - - returns = new wxBitmap(save_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "saveBitmap"); - - returns = new wxBitmap(saveall_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "saveAllBitmap"); - - returns = new wxBitmap(cut_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "cutBitmap"); - - returns = new wxBitmap(copy_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "copyBitmap"); - - returns = new wxBitmap(paste_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "pasteBitmap"); - - returns = new wxBitmap(help_xpm); - wxlState.addToTrackedMemoryList(returns); - wxlState.pushuserdatatype(s_wxluatag_wxBitmap, returns ); - lua_setglobal(L, "helpBitmap"); - - return 0; - } - int LUACALL LuaError(lua_State *L, int status, int top) { --- 1167,1170 ---- |
|
From: John L. <jr...@us...> - 2006-02-03 04:54:06
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24553/wxLua/bindings Modified Files: genwxbind.lua Log Message: -1 to wxID_ANY match #if #endif with comment of #if statement Move CreateStandAloneBitmaps from internal.cpp to wxlua.cpp, the app allow %rename for enums in genwxbind.lua, remove #defines in internal.h (a hack) Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** genwxbind.lua 24 Jan 2006 05:23:31 -0000 1.19 --- genwxbind.lua 3 Feb 2006 04:53:57 -0000 1.20 *************** *** 2608,2618 **** local pos = string.find(dataType, "::") local namespace = "" if pos then ! namespace = string.sub(dataType, 0, pos - 1) .. "::" end local enumBinding = { ! Map = " { \""..member.Name.."\", false, "..namespace..member.Name..", 0 },\n", Condition = fullcondition } --- 2608,2622 ---- local pos = string.find(dataType, "::") local namespace = "" + local luaname = member.AltName or member.Name -- for %rename if pos then ! namespace = string.sub(dataType, 0, pos - 1) ! -- luaname = namespace.."_"..luaname -- FIXME unrem this to put enums as wxFile::read -> wxFile_read ! namespace = namespace.."::" end + local enumBinding = { ! Map = " { \""..luaname.."\", false, "..namespace..member.Name..", 0 },\n", Condition = fullcondition } |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:07:35
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3391/modules/wxbind/setup Added Files: wxluasetup.h Log Message: moved wxluasetup.h --- NEW FILE: wxluasetup.h --- // Automatically generated by utils/get_luasetup edit as necessary. #ifndef __WXLUA_SETUP__ #define __WXLUA_SETUP__ #define wxLUA_USE_FL 0 #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 #define wxLUA_USE_wxAcceleratorTable 1 #define wxLUA_USE_wxApp 1 #define wxLUA_USE_wxArrayInt 1 #define wxLUA_USE_wxArrayString 1 #define wxLUA_USE_wxBitmap 1 #define wxLUA_USE_wxBitmapButton 1 #define wxLUA_USE_wxBrushList 1 #define wxLUA_USE_wxButton 1 #define wxLUA_USE_wxCalendarCtrl 1 #define wxLUA_USE_wxCaret 1 #define wxLUA_USE_wxCheckBox 1 #define wxLUA_USE_wxCheckListBox 1 #define wxLUA_USE_wxChoice 1 #define wxLUA_USE_wxClassInfo 1 #define wxLUA_USE_wxClipboard 1 #define wxLUA_USE_wxColourDialog 1 #define wxLUA_USE_wxColourPenBrush 1 #define wxLUA_USE_wxComboBox 1 #define wxLUA_USE_wxCommandProcessor 1 #define wxLUA_USE_wxConfig 1 #define wxLUA_USE_wxCursor 1 #define wxLUA_USE_wxCriticalSection 1 #define wxLUA_USE_wxCriticalSectionLocker 1 #define wxLUA_USE_wxDataObject 1 #define wxLUA_USE_wxDateSpan 1 #define wxLUA_USE_wxDateTime 1 #define wxLUA_USE_wxDC 1 #define wxLUA_USE_wxDialog 1 #define wxLUA_USE_wxDir 1 #define wxLUA_USE_wxDirDialog 1 #define wxLUA_USE_wxDragDrop 1 #define wxLUA_USE_wxFile 1 #define wxLUA_USE_wxFileDialog 1 #define wxLUA_USE_wxFileHistory 1 #define wxLUA_USE_wxFileName 1 #define wxLUA_USE_wxFindReplaceDialog 1 #define wxLUA_USE_wxFont 1 #define wxLUA_USE_wxFontDialog 1 #define wxLUA_USE_wxFontEnumerator 1 #define wxLUA_USE_wxFontList 1 #define wxLUA_USE_wxFontMapper 1 #define wxLUA_USE_wxFrame 1 #define wxLUA_USE_wxGauge 1 #define wxLUA_USE_wxGenericValidator 1 #define wxLUA_USE_wxGrid 1 #define wxLUA_USE_wxHashTable 1 #define wxLUA_USE_wxHelpController 1 #define wxLUA_USE_wxHTML 1 #define wxLUA_USE_wxHtmlHelpController 1 #define wxLUA_USE_wxIcon 1 #define wxLUA_USE_wxID_XXX 1 #define wxLUA_USE_wxImage 1 #define wxLUA_USE_wxImageList 1 #define wxLUA_USE_wxLayoutConstraints 1 #define wxLUA_USE_wxList 1 #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 #define wxLUA_USE_wxLuaDebugServer 1 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 #define wxLUA_USE_wxMetafile 1 #define wxLUA_USE_wxMiniFrame 1 #define wxLUA_USE_wxNotebook 1 #define wxLUA_USE_wxObject 1 #define wxLUA_USE_wxPalette 1 #define wxLUA_USE_wxPenList 1 #define wxLUA_USE_wxPointSizeRect 1 #define wxLUA_USE_wxPrint 1 #define wxLUA_USE_wxProgressDialog 1 #define wxLUA_USE_wxRadioBox 1 #define wxLUA_USE_wxRadioButton 1 #define wxLUA_USE_wxRegEx 1 #define wxLUA_USE_wxRegion 1 #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 #define wxLUA_USE_wxScrolledWindow 1 #define wxLUA_USE_wxSingleChoiceDialog 1 #define wxLUA_USE_wxSizer 1 #define wxLUA_USE_wxSlider 1 #define wxLUA_USE_wxSocket 1 #define wxLUA_USE_wxSpinButton 1 #define wxLUA_USE_wxSpinCtrl 1 #define wxLUA_USE_wxSplitterWindow 1 #define wxLUA_USE_wxStaticBitmap 1 #define wxLUA_USE_wxStaticBox 1 #define wxLUA_USE_wxStaticLine 1 #define wxLUA_USE_wxStaticText 1 #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 #define wxLUA_USE_wxTextEntryDialog 1 #define wxLUA_USE_wxTextValidator 1 #define wxLUA_USE_wxTimer 1 #define wxLUA_USE_wxTimeSpan 1 #define wxLUA_USE_wxToolbar 1 #define wxLUA_USE_wxTooltip 1 #define wxLUA_USE_wxTreeCtrl 1 #define wxLUA_USE_wxValidator 1 #define wxLUA_USE_wxWave 1 #define wxLUA_USE_wxWindowList 1 #define wxLUA_USE_wxWizard 1 #define wxLUA_USE_wxXMLResource 1 #endif // __WXLUA_SETUP__ |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:06:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3060/setup Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbind/setup added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:06:03
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2686/build/bakefiles Modified Files: Bakefiles.bkgen Log Message: added wxbindstc DSP Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Bakefiles.bkgen 2 Feb 2006 23:02:28 -0000 1.6 --- Bakefiles.bkgen 2 Feb 2006 23:05:54 -0000 1.7 *************** *** 14,18 **** ../../modules/build/bakefiles/modules.bkl ../../util/build/bakefiles/util.bkl - ../../modules/wxbind/build/wxbindcustom.bkl </input> --- 14,17 ---- |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:06:03
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2686/modules/build/bakefiles Added Files: common.bkl Log Message: added wxbindstc DSP --- NEW FILE: common.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: common.bkl,v 1.1 2006/02/02 23:05:54 frm Exp $ --> <!-- ====================================================================== --> <!-- WXLUA MODULES BAKEFILE --> <!-- --> <!-- The bakefile used to build all the modules. --> <!-- ====================================================================== --> <makefile> <!-- This file contains the wxLua template --> <include file="../../../build/bakefiles/wxluabase.bkl" once="1"/> <!-- ================================================================== --> <!-- SOURCES and HEADERS LIST --> <!-- ================================================================== --> <!-- All the source files & header files linked above are relative to our MODULE dir. --> <set var="FILELISTDIR">../..</set> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_MODULEDIR">../..</set> <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set> <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="FORMAT=='autoconf'"> <set var="SRCDIR">.</set> <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: mkdir mybuild && cd mybuild && ../configure && make --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> <!-- top_builddir already ends with '/' --> <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set> <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> <!-- the ldllmain.c file must be excluded ! --> <set var="LUA_SRC">$(fileList('lua/src/*.c', '*dll*'))</set> <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> <set var="LUALIB_SRC">$(fileList('lua/src/lib/*.c'))</set> <set var="LUALIB_HDR">$(fileList('lua/src/lib/*.h'))</set> <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set> <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set> <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set> <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set> <set var="WXLUADEBUG_SRC">$(fileList('wxluadebug/src/*.cpp'))</set> <set var="WXLUADEBUG_HDR">$(fileList('wxluadebug/include/*.h'))</set> <set var="WXLUASOCKET_SRC">$(fileList('wxluasocket/src/*.cpp'))</set> <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> <!-- ================================================================== --> <!-- The list of wxLua OPTIONS --> <!-- ================================================================== --> <!-- modules-specific options --> <include file="options.bkl"/> <!-- ================================================================== --> <!-- NEW RULES --> <!-- with these ones, each module/sample target takes few lines only --> <!-- ================================================================== --> <define-rule name="wxlua_lib" extends="lib"> <template> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> <set var="__modname"/> </template> <define-tag name="module-name"> <set var="__modname">$(value)</set> <set var="__modnamelow">$(__modname.lower())</set> <!-- The library name will look something like: libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) on Unix; on win32 instead: wxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib) --> <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> </define-tag> </define-rule> <define-rule name="wxlua_dll" extends="dll"> <template> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> <!-- The DLL version --> <version>$(WXLUA_VERSION)</version> <so_version>$(WXLUA_SOVERSION)</so_version> <mac_version>$(WXLUA_MACVERSION)</mac_version> <!-- Libraries must be put in the right order ! --> <wxlua-req-libs/> <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> <wx-lib>net</wx-lib> <wx-lib>xml</wx-lib> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> <set var="__modname"/> </template> <define-tag name="module-name"> <set var="__modname">$(value)</set> <set var="__modnamelow">$(__modname.lower())</set> <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> <!-- now, shared stuff --> <define>$(value)_MAKINGDLL</define> </define-tag> </define-rule> </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:04:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1824 Added Files: modules_mod_wxbindstc.dsp Log Message: added wxbindstc DSP --- NEW FILE: modules_mod_wxbindstc.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_wxbindstc" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=mod_wxbindstc - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbindstc.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbindstc.mak" CFG="mod_wxbindstc - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_wxbindstc - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindstc - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindstc - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindstc - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindstc - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindstc - Win32 Unicode Release" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindstc - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindstc - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dllud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dllud" # PROP Intermediate_Dir "msvc6prjud\mod_wxbindstc" # 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_dllud\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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_dllud\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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 "WXBINDSTC_MAKINGDLL" /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 "WXBINDSTC_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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_dllud\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua_msw26ud_wxbindstc.lib" /debug # ADD LINK32 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_dllud\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dllu" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dllu" # PROP Intermediate_Dir "msvc6prju\mod_wxbindstc" # 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_dllu\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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_dllu\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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 WXBINDSTC_MAKINGDLL # 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 WXBINDSTC_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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_dllu\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua_msw26u_wxbindstc.lib" # ADD LINK32 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_dllu\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dlld" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dlld" # PROP Intermediate_Dir "msvc6prjd\mod_wxbindstc" # 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_dlld\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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_dlld\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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 "WXBINDSTC_MAKINGDLL" /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 "WXBINDSTC_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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_dlld\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua_msw26d_wxbindstc.lib" /debug # ADD LINK32 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_dlld\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prj\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prj\mod_wxbindstc" # 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\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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\wxbindstc_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBINDSTC_MAKINGDLL" /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 WXBINDSTC_MAKINGDLL # 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 WXBINDSTC_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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\wxbindstc_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" # ADD LINK32 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\wxbindstc_dll.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" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_libud" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_libud" # PROP Intermediate_Dir "msvc6prjud\mod_wxbindstc" # 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_libud\wxlua_msw26ud_wxbindstc.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_libud\wxlua_msw26ud_wxbindstc.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_wxbindstc.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_libu" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_libu" # PROP Intermediate_Dir "msvc6prju\mod_wxbindstc" # 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_libu\wxlua_msw26u_wxbindstc.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_libu\wxlua_msw26u_wxbindstc.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_wxbindstc.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_libd" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_libd" # PROP Intermediate_Dir "msvc6prjd\mod_wxbindstc" # 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_libd\wxlua_msw26d_wxbindstc.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_libd\wxlua_msw26d_wxbindstc.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_wxbindstc.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prj\mod_wxbindstc" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prj\mod_wxbindstc" # 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_wxbindstc.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_wxbindstc.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_wxbindstc.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_wxbindstc.lib" !ENDIF # Begin Target # Name "mod_wxbindstc - Win32 DLL Unicode Debug" # Name "mod_wxbindstc - Win32 DLL Unicode Release" # Name "mod_wxbindstc - Win32 DLL Debug" # Name "mod_wxbindstc - Win32 DLL Release" # Name "mod_wxbindstc - Win32 Unicode Debug" # Name "mod_wxbindstc - Win32 Unicode Release" # Name "mod_wxbindstc - Win32 Debug" # Name "mod_wxbindstc - Win32 Release" # Begin Group "WXBINDSTC sources" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxbindstc\src\stc.cpp # End Source File # Begin Source File SOURCE=..\..\wxbindstc\src\wxstc_builtin.cpp # End Source File # Begin Source File SOURCE=..\..\wxbindstc\src\wxstc_class.cpp # End Source File # Begin Source File SOURCE=..\..\wxbindstc\src\wxstc_define.cpp # End Source File # Begin Source File SOURCE=..\..\wxbindstc\src\wxstc_event.cpp # End Source File # Begin Source File SOURCE=..\..\wxbindstc\src\wxstc_object.cpp # End Source File # End Group # Begin Group "WXBINDSTC headers" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxbindstc\include\wxbind.h # End Source File # End Group # End Target # End Project |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: Added infrastructure to build custom wxbind Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** makefile.bcc 2 Feb 2006 18:46:44 -0000 1.22 --- makefile.bcc 2 Feb 2006 23:02:29 -0000 1.23 *************** *** 118,123 **** MOD_LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lua.obj ! WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 118,123 ---- MOD_LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lua.obj ! WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 130,135 **** borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj ! WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 130,135 ---- borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj ! WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 142,147 **** borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj ! WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 142,147 ---- borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj ! WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 185,190 **** borland$(WXLIBPOSTFIX)\wxbind_lib_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 185,190 ---- borland$(WXLIBPOSTFIX)\wxbind_lib_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 228,233 **** borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 228,233 ---- borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 241,246 **** borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj \ borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj ! WXBINDSTC_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 241,246 ---- borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj \ borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj ! WXBINDSTC_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 254,259 **** borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj \ borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj ! WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 254,259 ---- borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj \ borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj ! WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 264,269 **** borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ --- 264,269 ---- borland$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ *************** *** 274,278 **** borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 274,279 ---- borland$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj \ borland$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ *************** *** 287,291 **** borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj ! WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ --- 288,293 ---- borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj ! WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ Index: modules.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules.dsw 2 Feb 2006 18:46:44 -0000 1.4 --- modules.dsw 2 Feb 2006 23:02:29 -0000 1.5 *************** *** 54,70 **** ############################################################################### ! Project: "wxbindstc_lib"=modules_wxbindstc_lib.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "wxbindstc_dll"=modules_wxbindstc_dll.dsp - Package Owner=<4> Package=<5> --- 54,58 ---- ############################################################################### ! Project: "mod_wxbindstc"=modules_mod_wxbindstc.dsp - Package Owner=<4> Package=<5> Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** modules_mod_wxbind.dsp 2 Feb 2006 18:46:44 -0000 1.10 --- modules_mod_wxbind.dsp 2 Feb 2006 23:02:29 -0000 1.11 *************** *** 48,57 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /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 "WXBIND_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /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 "WXBIND_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxbind" # 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_dllud\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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_dllud\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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 "WXBIND_MAKINGDLL" /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 "WXBIND_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # PROP Intermediate_Dir "msvc6prju\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXBIND_MAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXBIND_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxbind" # 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_dllu\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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_dllu\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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 WXBIND_MAKINGDLL ! # 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 WXBIND_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXBIND_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXBIND_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxbind" # 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_dlld\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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_dlld\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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 "WXBIND_MAKINGDLL" /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 "WXBIND_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # PROP Intermediate_Dir "msvc6prj\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXBIND_MAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXBIND_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxbind" # 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\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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\wxbind_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXBIND_MAKINGDLL" /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 WXBIND_MAKINGDLL ! # 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 WXBIND_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,153 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 148,153 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxbind" # 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_libud\wxlua_msw26ud_wxbind.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_libud\wxlua_msw26ud_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 171,176 **** # PROP Intermediate_Dir "msvc6prju\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 171,176 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxbind" # 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_libu\wxlua_msw26u_wxbind.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_libu\wxlua_msw26u_wxbind.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 194,199 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 194,199 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxbind" # 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_libd\wxlua_msw26d_wxbind.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_libd\wxlua_msw26d_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 217,222 **** # PROP Intermediate_Dir "msvc6prj\mod_wxbind" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 217,222 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxbind" # 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_wxbind.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_wxbind.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /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.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.wat 2 Feb 2006 18:46:44 -0000 1.19 --- makefile.wat 2 Feb 2006 23:02:29 -0000 1.20 *************** *** 262,266 **** MOD_LUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj ! WXLUA_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & --- 262,267 ---- MOD_LUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj ! WXLUA_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) & ! $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & *************** *** 273,278 **** watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj ! WXLUA_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 274,280 ---- watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.obj ! WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 284,289 **** watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj ! WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 286,292 ---- watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.obj ! WXBIND_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 326,331 **** watcom$(WXLIBPOSTFIX)\wxbind_lib_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 329,335 ---- watcom$(WXLIBPOSTFIX)\wxbind_lib_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 368,373 **** watcom$(WXLIBPOSTFIX)\wxbind_dll_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 372,378 ---- watcom$(WXLIBPOSTFIX)\wxbind_dll_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 380,385 **** watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj & watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj ! WXBINDSTC_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 385,391 ---- watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj & watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj ! WXBINDSTC_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 392,397 **** watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj & watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj ! WXLUADEBUG_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 398,404 ---- watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj & watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj ! WXLUADEBUG_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 401,406 **** watcom$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 408,414 ---- watcom$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 410,415 **** watcom$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 418,424 ---- watcom$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.obj & watcom$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & *************** *** 422,427 **** watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj ! WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & ! -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & --- 431,437 ---- watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.obj ! WXLUASOCKET_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & ! -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** makefile.gcc 2 Feb 2006 18:46:44 -0000 1.21 --- makefile.gcc 2 Feb 2006 23:02:29 -0000 1.22 *************** *** 88,93 **** MOD_LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 88,93 ---- MOD_LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 100,105 **** mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 100,105 ---- mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 112,117 **** mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o ! WXBIND_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 112,117 ---- mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlintrp.o ! WXBIND_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 155,160 **** mingw$(WXLIBPOSTFIX)\wxbind_lib_thread.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_help.o ! WXBIND_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 155,160 ---- mingw$(WXLIBPOSTFIX)\wxbind_lib_thread.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_help.o ! WXBIND_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 198,203 **** mingw$(WXLIBPOSTFIX)\wxbind_dll_thread.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_help.o ! WXBINDSTC_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 198,203 ---- mingw$(WXLIBPOSTFIX)\wxbind_dll_thread.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_help.o ! WXBINDSTC_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 211,216 **** mingw$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.o \ mingw$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.o ! WXBINDSTC_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 211,216 ---- mingw$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.o \ mingw$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.o ! WXBINDSTC_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 224,229 **** mingw$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.o \ mingw$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.o ! WXLUADEBUG_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 224,229 ---- mingw$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.o \ mingw$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.o ! WXLUADEBUG_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 234,239 **** mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 234,239 ---- mingw$(WXLIBPOSTFIX)\wxluadebug_lib_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 244,249 **** mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 244,249 ---- mingw$(WXLIBPOSTFIX)\wxluadebug_dll_splttree.o \ mingw$(WXLIBPOSTFIX)\wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ *************** *** 257,262 **** mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.o ! WXLUASOCKET_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ --- 257,262 ---- mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_dservice.o ! WXLUASOCKET_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_wxluasocket.dsp 29 Jan 2006 15:45:40 -0000 1.9 --- modules_mod_wxluasocket.dsp 2 Feb 2006 23:02:29 -0000 1.10 *************** *** 48,57 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /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 "WXLUASOCKET_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /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 "WXLUASOCKET_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # 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_dllud\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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_dllud\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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 "WXLUASOCKET_MAKINGDLL" /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 "WXLUASOCKET_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # PROP Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUASOCKET_MAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUASOCKET_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxluasocket" # 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_dllu\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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_dllu\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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 WXLUASOCKET_MAKINGDLL ! # 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 WXLUASOCKET_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUASOCKET_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUASOCKET_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxluasocket" # 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_dlld\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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_dlld\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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 "WXLUASOCKET_MAKINGDLL" /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 "WXLUASOCKET_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # PROP Intermediate_Dir "msvc6prj\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUASOCKET_MAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUASOCKET_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxluasocket" # 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\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUASOCKET_MAKINGDLL" /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 WXLUASOCKET_MAKINGDLL ! # 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 WXLUASOCKET_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,153 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 148,153 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # 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_libud\wxlua_msw26ud_wxluasocket.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_libud\wxlua_msw26ud_wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 171,176 **** # PROP Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /E... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: Added infrastructure to build custom wxbind Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** options.bkl 27 Jan 2006 21:57:10 -0000 1.7 --- options.bkl 2 Feb 2006 23:02:29 -0000 1.8 *************** *** 61,74 **** </if> - - <option name="WXLUASETUP_DIR" category="path"> - <default-value>$(WXLUASETUP_DIR_DEFAULT)</default-value> - <description>The folder where wxluasetup.h is searched</description> - </option> - - <option name="WXLUABINDLIB_DIR" category="path"> - <default-value>$(WXLUABINDLIB_DIR_DEFAULT)</default-value> - <description>The folder where wxLuaBind library is sent</description> - </option> - </makefile> --- 61,63 ---- Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** modules.bkl 2 Feb 2006 18:46:44 -0000 1.17 --- modules.bkl 2 Feb 2006 23:02:29 -0000 1.18 *************** *** 13,166 **** <makefile> ! <!-- This file contains the wxLua template --> ! <include file="../../../build/bakefiles/wxluabase.bkl"/> ! ! ! <!-- ================================================================== --> ! <!-- SOURCES and HEADERS LIST --> ! <!-- ================================================================== --> ! ! <!-- All the source files & header files linked above are relative to our MODULE dir. --> ! <set var="FILELISTDIR">../..</set> ! <if cond="FORMAT!='autoconf'"> ! <set var="WXLUA_BASEDIR">../../..</set> ! <set var="WXLUA_MODULEDIR">../..</set> ! <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> ! ! <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set> ! <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> ! </if> ! <if cond="FORMAT=='autoconf'"> ! <set var="SRCDIR">.</set> ! ! <!-- In this way we support makefiles created from folders != root folder; ! i.e. with this trick you can do: ! mkdir mybuild && cd mybuild && ../configure && make ! --> ! <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> ! ! <!-- top_builddir already ends with '/' --> ! <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set> ! <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> ! </if> ! ! <!-- the ldllmain.c file must be excluded ! --> ! <set var="LUA_SRC">$(fileList('lua/src/*.c', '*dll*'))</set> ! <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> ! ! <set var="LUALIB_SRC">$(fileList('lua/src/lib/*.c'))</set> ! <set var="LUALIB_HDR">$(fileList('lua/src/lib/*.h'))</set> ! ! <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> ! <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> ! ! <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set> ! <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set> ! ! <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set> ! <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set> ! ! <set var="WXLUADEBUG_SRC">$(fileList('wxluadebug/src/*.cpp'))</set> ! <set var="WXLUADEBUG_HDR">$(fileList('wxluadebug/include/*.h'))</set> ! ! <set var="WXLUASOCKET_SRC">$(fileList('wxluasocket/src/*.cpp'))</set> ! <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> ! ! ! ! ! <!-- ================================================================== --> ! <!-- The list of wxLua OPTIONS --> ! <!-- ================================================================== --> ! ! <!-- modules-specific options --> ! <include file="options.bkl"/> ! ! ! <!-- ================================================================== --> ! <!-- NEW RULES --> ! <!-- with these ones, each module/sample target takes few lines only --> ! <!-- ================================================================== --> ! <define-rule name="wxlua_lib" extends="lib"> <template> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <install-to>$(LIBDIR)</install-to> ! <headers-install-to>$(INCLUDEDIR)</headers-install-to> ! ! <set var="__modname"/> </template> - <define-tag name="module-name"> - <set var="__modname">$(value)</set> - <set var="__modnamelow">$(__modname.lower())</set> - - <!-- - The library name will look something like: - libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) - on Unix; on win32 instead: - wxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib) - --> - <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname> - <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> - <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> - - <!-- This is required because wxbind.h refers to wx contrib section, too --> - <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> - - <!-- to make MSVC6PRJ output look better... --> - <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> - <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> - </define-tag> </define-rule> ! ! <define-rule name="wxlua_dll" extends="dll"> <template> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> ! <install-to>$(LIBDIR)</install-to> ! <headers-install-to>$(INCLUDEDIR)</headers-install-to> ! ! <!-- The DLL version --> ! <version>$(WXLUA_VERSION)</version> ! <so_version>$(WXLUA_SOVERSION)</so_version> ! <mac_version>$(WXLUA_MACVERSION)</mac_version> ! ! <!-- Libraries must be put in the right order ! --> ! <wxlua-req-libs/> ! <wx-lib>xrc</wx-lib> ! <wx-lib>html</wx-lib> ! <wx-lib>media</wx-lib> ! <wx-lib>adv</wx-lib> ! <wx-lib>net</wx-lib> ! <wx-lib>xml</wx-lib> ! <wx-lib>core</wx-lib> ! <wx-lib>base</wx-lib> ! ! <set var="__modname"/> </template> ! <define-tag name="module-name"> ! <set var="__modname">$(value)</set> ! <set var="__modnamelow">$(__modname.lower())</set> ! ! <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname> ! <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> ! <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> ! ! <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> - <!-- to make MSVC6PRJ output look better... --> - <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group> - <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> - <!-- now, shared stuff --> - <define>$(value)_MAKINGDLL</define> - </define-tag> - </define-rule> --- 13,34 ---- <makefile> ! <!-- Contains stuff shared between this bakefile and the ! wxLua/modules/wxbind/build/wxbindcustom.bkl one --> ! <include file="common.bkl"/> ! <define-rule name="wxlua_stdlib" extends="wxlua_lib"> <template> ! <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> ! <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> </template> </define-rule> ! <define-rule name="wxlua_stddll" extends="wxlua_dll"> <template> ! <!-- always use wxLua's official wxluasetup.h for standard wxLua modules --> ! <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> </template> ! </define-rule> *************** *** 210,254 **** <!-- the wxLua lib & dll --> ! <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUA</module-name> ! </wxlua_lib> ! <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUA</module-name> ! </wxlua_dll> <!-- the wxBind lib & dll --> ! <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBIND</module-name> ! </wxlua_lib> ! <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBIND</module-name> ! </wxlua_dll> <!-- the wxBindSTC lib & dll --> ! <wxlua_lib id="wxbindstc_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBINDSTC</module-name> ! </wxlua_lib> ! <wxlua_dll id="wxbindstc_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBINDSTC</module-name> ! </wxlua_dll> ! ! ! <!-- FIXME: WXLUASETUP_DIR and WXLUABINDLIB_DIR --> <!-- the wxLuaDebug lib & dll --> ! <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUADEBUG</module-name> ! </wxlua_lib> ! <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUADEBUG</module-name> ! </wxlua_dll> <!-- the wxLuaSocket lib & dll --> ! <wxlua_lib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUASOCKET</module-name> ! </wxlua_lib> ! <wxlua_dll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUASOCKET</module-name> ! </wxlua_dll> --- 78,119 ---- <!-- the wxLua lib & dll --> ! <wxlua_stdlib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUA</module-name> ! </wxlua_stdlib> ! <wxlua_stddll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUA</module-name> ! </wxlua_stddll> <!-- the wxBind lib & dll --> ! <wxlua_stdlib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBIND</module-name> ! </wxlua_stdlib> ! <wxlua_stddll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBIND</module-name> ! </wxlua_stddll> <!-- the wxBindSTC lib & dll --> ! <wxlua_stdlib id="wxbindstc_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBINDSTC</module-name> ! </wxlua_stdlib> ! <wxlua_stddll id="wxbindstc_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBINDSTC</module-name> ! </wxlua_stddll> <!-- the wxLuaDebug lib & dll --> ! <wxlua_stdlib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUADEBUG</module-name> ! </wxlua_stdlib> ! <wxlua_stddll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUADEBUG</module-name> ! </wxlua_stddll> <!-- the wxLuaSocket lib & dll --> ! <wxlua_stdlib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXLUASOCKET</module-name> ! </wxlua_stdlib> ! <wxlua_stddll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXLUASOCKET</module-name> ! </wxlua_stddll> *************** *** 261,264 **** --- 126,130 ---- mod_wxlua=wxlua_lib+wxlua_dll mod_wxbind=wxbind_lib+wxbind_dll + mod_wxbindstc=wxbindstc_lib+wxbindstc_dll mod_wxluadebug=wxluadebug_lib+wxluadebug_dll mod_wxluasocket=wxluasocket_lib+wxluasocket_dll |
