Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.10,1.11 makefile.gcc,1.10,1.11 makefile.vc,1.8,1.9 makefile.wat,1.8,1.9
|
From: John L. <jr...@us...> - 2005-11-23 20:33:40
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17181/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebake, compiles using MSVC free compiler using nmake remove %noclassinfo for things that have classinfo Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.vc 23 Nov 2005 06:03:40 -0000 1.8 --- makefile.vc 23 Nov 2005 20:33:15 -0000 1.9 *************** *** 52,56 **** ### Variables: ### ! MOD_LUA_LIB_CFLAGS = /MD /DWIN32 /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 52,57 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = /MD /DWIN32 /DWXLUA_CODE /I..\..\lua\include $(CPPFLAGS) \ ! $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 146,149 **** --- 147,151 ---- msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \ *************** *** 190,193 **** --- 192,196 ---- msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \ + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \ *************** *** 651,654 **** --- 654,660 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 759,762 **** --- 765,771 ---- $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** + msvc$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.bcc 23 Nov 2005 06:03:40 -0000 1.10 --- makefile.bcc 23 Nov 2005 20:33:15 -0000 1.11 *************** *** 83,88 **** ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) \ ! $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 83,88 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include -DWXLUA_CODE -I..\..\lua\include \ ! $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 173,176 **** --- 173,177 ---- borland$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj \ + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj \ *************** *** 216,219 **** --- 217,221 ---- borland$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj \ + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj \ *************** *** 666,669 **** --- 668,674 ---- $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 774,777 **** --- 779,785 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.wat 23 Nov 2005 06:03:40 -0000 1.8 --- makefile.wat 23 Nov 2005 20:33:15 -0000 1.9 *************** *** 176,180 **** ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & --- 176,180 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -dWXLUA_CODE -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & *************** *** 264,267 **** --- 264,268 ---- watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj & + watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_define.obj & *************** *** 306,309 **** --- 307,311 ---- watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_wxlua.obj & + watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_define.obj & *************** *** 688,691 **** --- 690,696 ---- $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.obj : .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_class.obj : .AUTODEPEND ..\..\wxbind\src\wx_class.cpp $(CXX) -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< *************** *** 796,799 **** --- 801,807 ---- $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.obj : .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp + $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_class.obj : .AUTODEPEND ..\..\wxbind\src\wx_class.cpp $(CXX) -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.gcc 23 Nov 2005 06:03:40 -0000 1.10 --- makefile.gcc 23 Nov 2005 20:33:15 -0000 1.11 *************** *** 53,57 **** CPPDEPS = -MT$@ -MF$@.d -MD ! MOD_LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ --- 53,57 ---- CPPDEPS = -MT$@ -MF$@.d -MD ! MOD_LUA_LIB_CFLAGS = -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ *************** *** 144,147 **** --- 144,148 ---- mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlprint.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlua.o \ + mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_define.o \ *************** *** 187,190 **** --- 188,192 ---- mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlprint.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_wxlua.o \ + mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_class.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_define.o \ *************** *** 606,609 **** --- 608,614 ---- $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_builtin.o: ../../wxbind/src/wx_builtin.cpp + $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_lib_wx_class.o: ../../wxbind/src/wx_class.cpp $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 714,717 **** --- 719,725 ---- $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_builtin.o: ../../wxbind/src/wx_builtin.cpp + $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< + mingw$(WXLIBPOSTFIX)\wxbind_dll_wx_class.o: ../../wxbind/src/wx_class.cpp $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< |
