Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc, 1.73, 1.74 makefile.gcc, 1.72, 1.73 makefile.vc, 1.72, 1.73 makefile.wat, 1.72, 1.73
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.vc 1 Aug 2007 03:21:24 -0000 1.72 --- makefile.vc 1 Aug 2007 10:08:23 -0000 1.73 *************** *** 196,205 **** $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_43)$(VAR_199) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ [...1424 lines suppressed...] ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) /Ycwx/wxprec.h $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** makefile.bcc 1 Aug 2007 03:21:23 -0000 1.73 --- makefile.bcc 1 Aug 2007 10:08:23 -0000 1.74 *************** *** 255,264 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ [...1424 lines suppressed...] ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.wat 1 Aug 2007 03:21:24 -0000 1.72 --- makefile.wat 1 Aug 2007 10:08:24 -0000 1.73 *************** *** 874,883 **** $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & [...1420 lines suppressed...] $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj : .AUTODEPEND ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj : .AUTODEPEND ..\..\wxluasocket\src\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj : .AUTODEPEND ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** makefile.gcc 1 Aug 2007 03:21:23 -0000 1.72 --- makefile.gcc 1 Aug 2007 10:08:23 -0000 1.73 *************** *** 177,186 **** -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua.o \ ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlua_bind.o WXLUA_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ [...1420 lines suppressed...] $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.o: ../../wxluasocket/src/wxluasocket_bind.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.o: ../../wxluasocket/src/wxlsock.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.o: ../../wxluasocket/src/dummy.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.o: ../../wxluasocket/src/wxldserv.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.o: ../../wxluasocket/src/wxluasocket.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< |
