[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.86, 1.87 makefile.gcc, 1.85, 1.86 makefile.v

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31831/wxLua/modules/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
Add include for wxWidget's contrib/include for monolithic luamodule.

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** makefile.vc	21 Jan 2008 04:26:14 -0000	1.85
--- makefile.vc	21 Jan 2008 04:50:04 -0000	1.86
***************
*** 696,707 ****
  	$(VAR_201) $(VAR_203) /Fd..\..\..\lib\vc_$(VAR_210)\wx.pdb \
  	/I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \
! 	/I..\..\..\modules\wxbind\setup /DWXMAKINGDLL_LUAMODULE \
! 	/DWXMAKINGDLL_WXBINDADV /DWXMAKINGDLL_WXBINDAUI /DWXMAKINGDLL_WXBINDBASE \
! 	/DWXMAKINGDLL_WXBINDCORE /DWXMAKINGDLL_WXBINDGL /DWXMAKINGDLL_WXBINDHTML \
! 	/DWXMAKINGDLL_WXBINDMEDIA /DWXMAKINGDLL_WXBINDNET \
  	/DWXMAKINGDLL_WXBINDRICHTEXT /DWXMAKINGDLL_WXBINDSTC \
  	/DWXMAKINGDLL_WXBINDXML /DWXMAKINGDLL_WXBINDXRC /DWXMAKINGDLL_WXLUADEBUG \
! 	/DWXMAKINGDLL_WXLUASOCKET /DWXMAKINGDLL_WXLUA /GR /EHsc $(CPPFLAGS) \
! 	$(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
--- 696,708 ----
  	$(VAR_201) $(VAR_203) /Fd..\..\..\lib\vc_$(VAR_210)\wx.pdb \
  	/I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \
! 	/I..\..\..\modules\wxbind\setup /I$(WX_DIR)\contrib\include \
! 	/DWXMAKINGDLL_LUAMODULE /DWXMAKINGDLL_WXBINDADV /DWXMAKINGDLL_WXBINDAUI \
! 	/DWXMAKINGDLL_WXBINDBASE /DWXMAKINGDLL_WXBINDCORE /DWXMAKINGDLL_WXBINDGL \
! 	/DWXMAKINGDLL_WXBINDHTML /DWXMAKINGDLL_WXBINDMEDIA /DWXMAKINGDLL_WXBINDNET \
  	/DWXMAKINGDLL_WXBINDRICHTEXT /DWXMAKINGDLL_WXBINDSTC \
  	/DWXMAKINGDLL_WXBINDXML /DWXMAKINGDLL_WXBINDXRC /DWXMAKINGDLL_WXLUADEBUG \
! 	/DWXMAKINGDLL_WXLUASOCKET /DWXMAKINGDLL_WXLUA /GR /EHsc /Yu"wx/wxprec.h" \
! 	/Fp"vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_mod_luamodule_mono.pch" \
! 	$(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
***************
*** 1775,1779 ****

  !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1"
! ..\..\..\lib\vc_$(VAR_210)\wx.dll: make_dir_mod_luamodule_mono  $(MOD_LUAMODULE_MONO_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb"  /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<<
  	$(MOD_LUAMODULE_MONO_OBJECTS)  lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
--- 1776,1780 ----

  !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1"
! ..\..\..\lib\vc_$(VAR_210)\wx.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono  $(MOD_LUAMODULE_MONO_OBJECTS)
  	link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_202) /pdb:"..\..\..\lib\vc_$(VAR_210)\wx.pdb"  /LIBPATH:..\..\..\lib\vc_$(VAR_205) /LIBPATH:$(LUA_LIB_DIR) @<<
  	$(MOD_LUAMODULE_MONO_OBJECTS)  lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib
***************
*** 2409,2413 ****

  vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp

  vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp
--- 2410,2414 ----

  vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
! 	$(CXX) /c /nologo /TP /Fo$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) /Ycwx/wxprec.h ..\..\wxbind\src\dummy.cpp

  vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** makefile.bcc	21 Jan 2008 04:26:13 -0000	1.86
--- makefile.bcc	21 Jan 2008 04:50:04 -0000	1.87
***************
*** 687,696 ****
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI \
! 	-DWXMAKINGDLL_WXBINDBASE -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL \
! 	-DWXMAKINGDLL_WXBINDHTML -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \
  	-DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \
  	-DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \
! 	-DWXMAKINGDLL_WXLUASOCKET -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
--- 687,699 ----
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-I$(WX_DIR)\contrib\include -DWXMAKINGDLL_LUAMODULE \
! 	-DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI -DWXMAKINGDLL_WXBINDBASE \
! 	-DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL -DWXMAKINGDLL_WXBINDHTML \
! 	-DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \
  	-DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \
  	-DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \
! 	-DWXMAKINGDLL_WXLUASOCKET -DWXMAKINGDLL_WXLUA \
! 	-H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_mod_luamodule_mono.csm \
! 	-Hu $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
***************
*** 1642,1646 ****

  !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1"
! ..\..\..\lib\bcc_$(VAR_146)\wx.dll: make_dir_mod_luamodule_mono  $(MOD_LUAMODULE_MONO_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144)  -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&|
  	c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,,
--- 1645,1649 ----

  !if "$(MONOLITHIC_LUAMODULE)" == "1" && "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1"
! ..\..\..\lib\bcc_$(VAR_146)\wx.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj make_dir_mod_luamodule_mono  $(MOD_LUAMODULE_MONO_OBJECTS)
  	ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_144)  -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&|
  	c0d32.obj $(MOD_LUAMODULE_MONO_OBJECTS),$@,, lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_18)$(__RUNTIME_LIBS_16).lib,,
***************
*** 2276,2280 ****

  bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
! 	$(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) ..\..\wxbind\src\dummy.cpp

  bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp
--- 2279,2283 ----

  bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_dummy.obj: ..\..\wxbind\src\dummy.cpp
! 	$(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_MONO_CXXFLAGS) -H ..\..\wxbind\src\dummy.cpp

  bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_wxadv_adv.obj: ..\..\wxbind\src\wxadv_adv.cpp

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** makefile.wat	21 Jan 2008 04:26:14 -0000	1.85
--- makefile.wat	21 Jan 2008 04:50:05 -0000	1.86
***************
*** 1225,1234 ****
  	$(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules &
  	-i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup &
! 	-dWXMAKINGDLL_LUAMODULE -dWXMAKINGDLL_WXBINDADV -dWXMAKINGDLL_WXBINDAUI &
! 	-dWXMAKINGDLL_WXBINDBASE -dWXMAKINGDLL_WXBINDCORE -dWXMAKINGDLL_WXBINDGL &
! 	-dWXMAKINGDLL_WXBINDHTML -dWXMAKINGDLL_WXBINDMEDIA -dWXMAKINGDLL_WXBINDNET &
  	-dWXMAKINGDLL_WXBINDRICHTEXT -dWXMAKINGDLL_WXBINDSTC &
  	-dWXMAKINGDLL_WXBINDXML -dWXMAKINGDLL_WXBINDXRC -dWXMAKINGDLL_WXLUADEBUG &
! 	-dWXMAKINGDLL_WXLUASOCKET -dWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj &
--- 1225,1235 ----
  	$(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules &
  	-i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup &
! 	-i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_LUAMODULE &
! 	-dWXMAKINGDLL_WXBINDADV -dWXMAKINGDLL_WXBINDAUI -dWXMAKINGDLL_WXBINDBASE &
! 	-dWXMAKINGDLL_WXBINDCORE -dWXMAKINGDLL_WXBINDGL -dWXMAKINGDLL_WXBINDHTML &
! 	-dWXMAKINGDLL_WXBINDMEDIA -dWXMAKINGDLL_WXBINDNET &
  	-dWXMAKINGDLL_WXBINDRICHTEXT -dWXMAKINGDLL_WXBINDSTC &
  	-dWXMAKINGDLL_WXBINDXML -dWXMAKINGDLL_WXBINDXRC -dWXMAKINGDLL_WXLUADEBUG &
! 	-dWXMAKINGDLL_WXLUASOCKET -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj &

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** makefile.gcc	21 Jan 2008 04:26:14 -0000	1.85
--- makefile.gcc	21 Jan 2008 04:50:04 -0000	1.86
***************
*** 538,544 ****
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI \
! 	-DWXMAKINGDLL_WXBINDBASE -DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL \
! 	-DWXMAKINGDLL_WXBINDHTML -DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \
  	-DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \
  	-DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \
--- 538,545 ----
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-I$(WX_DIR)\contrib\include -DWXMAKINGDLL_LUAMODULE \
! 	-DWXMAKINGDLL_WXBINDADV -DWXMAKINGDLL_WXBINDAUI -DWXMAKINGDLL_WXBINDBASE \
! 	-DWXMAKINGDLL_WXBINDCORE -DWXMAKINGDLL_WXBINDGL -DWXMAKINGDLL_WXBINDHTML \
! 	-DWXMAKINGDLL_WXBINDMEDIA -DWXMAKINGDLL_WXBINDNET \
  	-DWXMAKINGDLL_WXBINDRICHTEXT -DWXMAKINGDLL_WXBINDSTC \
  	-DWXMAKINGDLL_WXBINDXML -DWXMAKINGDLL_WXBINDXRC -DWXMAKINGDLL_WXLUADEBUG \

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.86, 1.87 makefile.gcc, 1.85, 1.86 makefile.v

[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.86, 1.87 makefile.gcc, 1.85, 1.86 makefile.vc, 1.85, 1.86 makefile.wat, 1.85, 1.86