Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.85, 1.86 makefile.gcc, 1.84, 1.85 makefile.vc, 1.84, 1.85 makefile.wat, 1.84, 1.85
|
From: John L. <jr...@us...> - 2008-01-21 04:26:18
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22482/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Use correct WXMAKINGDLL_WXBINDXXX names Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** makefile.vc 21 Jan 2008 04:05:19 -0000 1.84 --- makefile.vc 21 Jan 2008 04:26:14 -0000 1.85 *************** *** 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 \ --- 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 \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** makefile.bcc 21 Jan 2008 04:05:19 -0000 1.85 --- makefile.bcc 21 Jan 2008 04:26:13 -0000 1.86 *************** *** 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 \ --- 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 \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** makefile.wat 21 Jan 2008 04:05:19 -0000 1.84 --- makefile.wat 21 Jan 2008 04:26:14 -0000 1.85 *************** *** 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 & --- 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 & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** makefile.gcc 21 Jan 2008 04:05:19 -0000 1.84 --- makefile.gcc 21 Jan 2008 04:26:14 -0000 1.85 *************** *** 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 \ --- 538,547 ---- $(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 = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_mono_luamodule.o \ |
