From: John L. <jr...@us...> - 2008-01-16 19:54:39
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.vc 16 Jan 2008 16:46:15 -0000 1.78 --- makefile.vc 16 Jan 2008 19:54:31 -0000 1.79 *************** *** 82,85 **** --- 82,91 ---- USE_WXBINDAUI = 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 *************** *** 212,215 **** --- 218,227 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUA /GR /EHsc /Yu"wx/wxprec.h" \ /Fp"vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.pch" \ *************** *** 244,247 **** --- 256,265 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDADV /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 274,277 **** --- 292,301 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDAUI /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 307,310 **** --- 331,340 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDBASE /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 357,360 **** --- 387,396 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDCORE /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 403,406 **** --- 439,448 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDGL /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 433,436 **** --- 475,484 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDHTML /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 463,466 **** --- 511,520 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDMEDIA /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 492,495 **** --- 546,555 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDNET /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 521,524 **** --- 581,590 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDRICHTEXT /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 550,553 **** --- 616,625 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDSTC /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 579,582 **** --- 651,660 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXML /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 608,611 **** --- 686,695 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXRC /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 637,640 **** --- 721,730 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUADEBUG /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 669,672 **** --- 759,768 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUASOCKET /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 685,688 **** --- 781,790 ---- $(VAR_196) $(VAR_198) /Fd..\..\..\lib\vc_$(VAR_202)\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.bcc 16 Jan 2008 16:46:14 -0000 1.79 --- makefile.bcc 16 Jan 2008 19:54:29 -0000 1.80 *************** *** 125,128 **** --- 125,138 ---- !endif + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + !ifndef USE_WXBINDBASE + USE_WXBINDBASE = 1 + !endif + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + !ifndef USE_WXBINDCORE + USE_WXBINDCORE = 1 + !endif + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] !ifndef USE_WXBINDGL *************** *** 271,275 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 281,292 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 299,303 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 316,327 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 324,328 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 348,359 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 352,356 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 383,394 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 397,401 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 435,446 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 438,442 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 483,494 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 463,467 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 515,526 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 488,492 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 547,558 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 512,516 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 578,589 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 536,540 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ --- 609,619 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ *************** *** 561,565 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 640,651 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 585,589 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 671,682 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 609,613 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 702,713 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 633,637 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 733,744 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 660,664 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 767,778 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 674,678 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj --- 788,799 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) \ ! $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.wat 16 Jan 2008 16:46:15 -0000 1.78 --- makefile.wat 16 Jan 2008 19:54:32 -0000 1.79 *************** *** 82,85 **** --- 82,91 ---- USE_WXBINDAUI = 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 *************** *** 858,862 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & --- 864,874 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & *************** *** 882,886 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & --- 894,904 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & *************** *** 903,907 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & --- 921,931 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & *************** *** 927,931 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & --- 951,961 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & *************** *** 968,972 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & --- 998,1008 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & *************** *** 1005,1009 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & --- 1041,1051 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & *************** *** 1026,1030 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & --- 1068,1078 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & *************** *** 1047,1051 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & --- 1095,1105 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & *************** *** 1067,1071 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & --- 1121,1131 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & *************** *** 1087,1091 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & --- 1147,1157 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & *************** *** 1107,1111 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & --- 1173,1183 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & *************** *** 1127,1131 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & --- 1199,1209 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & *************** *** 1147,1151 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & --- 1225,1235 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & *************** *** 1167,1171 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & --- 1251,1261 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & *************** *** 1190,1194 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & --- 1280,1290 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & *************** *** 1203,1207 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & --- 1299,1309 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.gcc 16 Jan 2008 16:46:14 -0000 1.78 --- makefile.gcc 16 Jan 2008 19:54:31 -0000 1.79 *************** *** 76,79 **** --- 76,85 ---- USE_WXBINDAUI := 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE := 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE := 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL := 1 *************** *** 196,201 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ --- 202,213 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ *************** *** 219,224 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ --- 231,242 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ *************** *** 239,244 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ --- 257,268 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ *************** *** 262,267 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ --- 286,297 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ *************** *** 302,307 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ --- 332,343 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ *************** *** 338,343 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ --- 374,385 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ *************** *** 358,363 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ --- 400,411 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ *************** *** 378,383 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ --- 426,437 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ *************** *** 397,402 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ --- 451,462 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ *************** *** 416,420 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ --- 476,486 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ *************** *** 435,440 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ --- 501,512 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ *************** *** 454,459 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(V... [truncated message content] |