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

[John L. <jr...@us...>]

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
Add WXMAKINGDLL_XXX for all the objects we link to for the luamodule_mono 
otherwise they are set for WXIMPORT. Note, ideally we wouldn't export them.


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** makefile.vc	21 Jan 2008 03:09:51 -0000	1.83
--- makefile.vc	21 Jan 2008 04:05:19 -0000	1.84
***************
*** 696,701 ****
  	$(VAR_201) $(VAR_203) /Fd..\..\..\lib\vc_$(VAR_210)\wx.pdb \
  	/I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \
! 	/I..\..\..\modules\wxbind\setup /DWXMAKINGDLL_LUAMODULE /GR /EHsc \
! 	$(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
--- 696,705 ----
  	$(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_ADV \
! 	/DWXMAKINGDLL_AUI /DWXMAKINGDLL_BASE /DWXMAKINGDLL_CORE /DWXMAKINGDLL_GL \
! 	/DWXMAKINGDLL_HTML /DWXMAKINGDLL_MEDIA /DWXMAKINGDLL_NET \
! 	/DWXMAKINGDLL_RICHTEXT /DWXMAKINGDLL_STC /DWXMAKINGDLL_XML \
! 	/DWXMAKINGDLL_XRC /DWXMAKINGDLL_DEBUG /DWXMAKINGDLL_SOCKET \
! 	/DWXMAKINGDLL_WXLUA /GR /EHsc $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** makefile.bcc	21 Jan 2008 03:09:50 -0000	1.84
--- makefile.bcc	21 Jan 2008 04:05:19 -0000	1.85
***************
*** 687,691 ****
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \
--- 687,695 ----
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_ADV -DWXMAKINGDLL_AUI \
! 	-DWXMAKINGDLL_BASE -DWXMAKINGDLL_CORE -DWXMAKINGDLL_GL -DWXMAKINGDLL_HTML \
! 	-DWXMAKINGDLL_MEDIA -DWXMAKINGDLL_NET -DWXMAKINGDLL_RICHTEXT \
! 	-DWXMAKINGDLL_STC -DWXMAKINGDLL_XML -DWXMAKINGDLL_XRC -DWXMAKINGDLL_DEBUG \
! 	-DWXMAKINGDLL_SOCKET -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj \

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** makefile.wat	21 Jan 2008 03:09:51 -0000	1.83
--- makefile.wat	21 Jan 2008 04:05:19 -0000	1.84
***************
*** 1225,1229 ****
  	$(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules &
  	-i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup &
! 	-dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  &
  	watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.obj &
--- 1225,1233 ----
  	$(VAR_139) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules &
  	-i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup &
! 	-dWXMAKINGDLL_LUAMODULE -dWXMAKINGDLL_ADV -dWXMAKINGDLL_AUI &
! 	-dWXMAKINGDLL_BASE -dWXMAKINGDLL_CORE -dWXMAKINGDLL_GL -dWXMAKINGDLL_HTML &
! 	-dWXMAKINGDLL_MEDIA -dWXMAKINGDLL_NET -dWXMAKINGDLL_RICHTEXT &
! 	-dWXMAKINGDLL_STC -dWXMAKINGDLL_XML -dWXMAKINGDLL_XRC -dWXMAKINGDLL_DEBUG &
! 	-dWXMAKINGDLL_SOCKET -dWXMAKINGDLL_WXLUA $(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.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** makefile.gcc	21 Jan 2008 03:09:50 -0000	1.83
--- makefile.gcc	21 Jan 2008 04:05:19 -0000	1.84
***************
*** 538,542 ****
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.o \
--- 538,546 ----
  	$(VAR_144) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \
  	-I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup \
! 	-DWXMAKINGDLL_LUAMODULE -DWXMAKINGDLL_ADV -DWXMAKINGDLL_AUI \
! 	-DWXMAKINGDLL_BASE -DWXMAKINGDLL_CORE -DWXMAKINGDLL_GL -DWXMAKINGDLL_HTML \
! 	-DWXMAKINGDLL_MEDIA -DWXMAKINGDLL_NET -DWXMAKINGDLL_RICHTEXT \
! 	-DWXMAKINGDLL_STC -DWXMAKINGDLL_XML -DWXMAKINGDLL_XRC -DWXMAKINGDLL_DEBUG \
! 	-DWXMAKINGDLL_SOCKET -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS)
  MOD_LUAMODULE_MONO_OBJECTS =  \
  	gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.o \