Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.42,1.43 makefile.gcc,1.42,1.43 makefile.vc,1.41,1.42 makefile.wat,1.41,1.42 modules_mod_lua_lib.dsp,1.18,1.19
|
From: Francesco M. <fr...@us...> - 2006-05-14 12:56:00
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28721/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_lua_lib.dsp Log Message: added LUA checks to configure script Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.vc 29 Mar 2006 18:41:42 -0000 1.41 --- makefile.vc 14 May 2006 12:55:56 -0000 1.42 *************** *** 77,81 **** $(____BUILD_32) $(____BUILD_33) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.pdb \ ! /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 77,81 ---- $(____BUILD_32) $(____BUILD_33) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.pdb \ ! /DWXLUA_LUA_NEWTHREAD /I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 577,581 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! link /NOLOGO /OUT:$@ $(LDFLAGS) $(____BUILD_1_1) @<< $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib << --- 577,581 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! link /NOLOGO /OUT:$@ $(LDFLAGS) $(____BUILD_1_1) @<< $(MOD_LUA_OBJECTS) ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib << Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** modules_mod_lua_lib.dsp 29 Mar 2006 18:41:42 -0000 1.18 --- modules_mod_lua_lib.dsp 14 May 2006 12:55:56 -0000 1.19 *************** *** 55,60 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 55,60 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 78,83 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 78,83 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 101,106 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 101,106 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 124,129 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 124,129 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 147,152 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 147,152 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 170,175 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 170,175 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 193,198 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 193,198 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 216,221 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 216,221 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 239,244 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 239,244 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 262,267 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 262,267 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 285,290 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 285,290 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 308,313 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 308,313 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 331,336 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 331,336 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 354,359 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 354,359 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 377,382 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 377,382 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 400,405 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 400,405 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.bcc 29 Mar 2006 18:41:41 -0000 1.42 --- makefile.bcc 14 May 2006 12:55:56 -0000 1.43 *************** *** 109,113 **** MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____SHARED) $(____BUILD) \ ! $(____BUILD_9) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ --- 109,114 ---- MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____SHARED) $(____BUILD) \ ! $(____BUILD_9) -DWXLUA_LUA_NEWTHREAD -I..\..\lua\include $(CPPFLAGS) \ ! $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ *************** *** 574,578 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____BUILD_9) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | --- 575,579 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____BUILD_9) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.wat 29 Mar 2006 18:41:42 -0000 1.41 --- makefile.wat 14 May 2006 12:55:56 -0000 1.42 *************** *** 492,496 **** MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_21) $(____BUILD_22) & ! -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & --- 492,496 ---- MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_21) $(____BUILD_22) & ! -dWXLUA_LUA_NEWTHREAD -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.gcc 29 Mar 2006 18:41:42 -0000 1.42 --- makefile.gcc 14 May 2006 12:55:56 -0000 1.43 *************** *** 69,73 **** CPPDEPS = -MT$@ -MF$@.d -MD MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_18) $(____BUILD_20) \ ! -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ --- 69,73 ---- CPPDEPS = -MT$@ -MF$@.d -MD MOD_LUA_LIB_CFLAGS = $(____SHARED) $(____BUILD) $(____BUILD_18) $(____BUILD_20) \ ! -DWXLUA_LUA_NEWTHREAD -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ *************** *** 668,672 **** ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ! $(CC) -o $@ $(MOD_LUA_OBJECTS) $(LDFLAGS) $(____BUILD_20) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ifeq ($(SHARED),0) --- 668,672 ---- ..\..\..\bin\wxlua-lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ! $(CC) -o $@ $(MOD_LUA_OBJECTS) $(LDFLAGS) $(____BUILD_20) ..\..\..\lib\gcc_lib\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.a ifeq ($(SHARED),0) |
