Menu
▾
▴
[Wxlua-commit] wxLua/apps/wxlua/src wrap.bat,1.1,1.2 wxLua_wx26.dsp,1.1,1.2 wxLua_wx26.dsw,1.1,1.2 wxlua.rc,1.1,1.2
|
From: John L. <jr...@us...> - 2005-06-07 19:58:34
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14249/wxLua/apps/wxlua/src Modified Files: wrap.bat wxLua_wx26.dsp wxLua_wx26.dsw wxlua.rc Log Message: Make it compile using VC6 Index: wxlua.rc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.rc 7 Jun 2005 04:17:29 -0000 1.1 --- wxlua.rc 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 8,12 **** ///////////////////////////////////////////////////////////////////////////// ! lua ICON "wxlua.ico" //logo BITMAP "..\examples\bitmaps\wxLua.bmp" --- 8,12 ---- ///////////////////////////////////////////////////////////////////////////// ! lua ICON "..\\..\\..\\art\\wxlua.ico" //logo BITMAP "..\examples\bitmaps\wxLua.bmp" Index: wxLua_wx26.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxLua_wx26.dsp 7 Jun 2005 04:17:29 -0000 1.1 --- wxLua_wx26.dsp 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 42,47 **** # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 42,47 ---- # PROP Intermediate_Dir "vc_msw_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MD /Fdvc_msw_wx26\wxLua_wx26.pdb /O1 /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\msw" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 52,57 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 ..\lib\lua50_wx26.lib ..\lib\wxlualib_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua_wx26.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" --- 52,57 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" lua_wx26.lib wxlua_wx26.lib wxluadebug_wx26.lib wxluasocket_wx26.lib wxmsw26_stc.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_adv.lib wxbase26_net.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_msw_wx26\wxLua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" *************** *** 67,72 **** # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\include" /I "..\lua\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 --- 67,72 ---- # PROP Intermediate_Dir "vc_mswd_wx26" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /GR /GX /MDd /Zi /Gm /GZ /Fdvc_mswd_wx26\wxLua_wx26.pdb /Od /GR /GX /I "$(WXWIN)\include" /I "$(WXWIN)\lib\vc_lib\mswd" /W4 /I "." /I "$(WXWIN)\contrib\include" /I "..\..\..\modules" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 77,83 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 ..\lib\lua50d_wx26.lib ..\lib\wxlualibd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLua_wx26.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! --- 77,82 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows ! # ADD LINK32 /libpath:"..\..\..\lib" luad_wx26.lib wxluad_wx26.lib wxluadebugd_wx26.lib wxluasocketd_wx26.lib wxmsw26d_stc.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_adv.lib wxbase26d_net.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib /nologo /machine:i386 /out:"vc_mswd_wx26\wxLuad.exe" /debug /libpath:"$(WXWIN)\lib\vc_lib" /subsystem:windows *************** *** 91,107 **** # Begin Source File ! SOURCE=.\wxLua.ico # End Source File # Begin Source File ! SOURCE=..\import\override.hpp # End Source File # Begin Source File ! SOURCE=..\import\wxLuaWrap.i !IF "$(CFG)" == "wxLua_wx26 - Win32 Release" ! USERDEP__WXLUA="..\import\override.hpp" # Begin Custom Build - Generating Binding --- 90,106 ---- # Begin Source File ! SOURCE=..\..\..\icons\wxlua.ico # End Source File # Begin Source File ! SOURCE=..\..\..\bindings\wxwidgets\override.hpp # End Source File # Begin Source File ! SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.i !IF "$(CFG)" == "wxLua_wx26 - Win32 Release" ! USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" # Begin Custom Build - Generating Binding *************** *** 114,118 **** !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" ! USERDEP__WXLUA="..\import\override.hpp" # Begin Custom Build - Generating Binding --- 113,117 ---- !ELSEIF "$(CFG)" == "wxLua_wx26 - Win32 Debug" ! USERDEP__WXLUA="..\..\..\bindings\wxwidgets\override.hpp" # Begin Custom Build - Generating Binding *************** *** 128,132 **** # Begin Source File ! SOURCE=.\wxLuaWrap.cpp # End Source File # Begin Source File --- 127,131 ---- # Begin Source File ! SOURCE=.\wxluawrap.cpp # End Source File # Begin Source File *************** *** 136,144 **** # Begin Source File ! SOURCE=.\wxluaapp.cpp # End Source File # Begin Source File ! SOURCE=.\wxluaapp.h # End Source File # Begin Source File --- 135,143 ---- # Begin Source File ! SOURCE=.\wxlua.cpp # End Source File # Begin Source File ! SOURCE=.\wxlua.h # End Source File # Begin Source File Index: wrap.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wrap.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wrap.bat 7 Jun 2005 04:17:29 -0000 1.1 --- wrap.bat 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 6,15 **** :RELEASE ! ..\bin\lua -e"target=\"msw\"" wrap.lua echo Creating wrappers release goto END :DEBUG ! ..\bin\luad -e"target=\"msw\"" wrap.lua echo Creating wrappers debug goto END --- 6,15 ---- :RELEASE ! ..\..\..\bin\lua -e"target=\"msw\"" wrap.lua echo Creating wrappers release goto END :DEBUG ! ..\..\..\bin\luad -e"target=\"msw\"" wrap.lua echo Creating wrappers debug goto END Index: wxLua_wx26.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxLua_wx26.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxLua_wx26.dsw 7 Jun 2005 04:17:29 -0000 1.1 --- wxLua_wx26.dsw 7 Jun 2005 19:58:25 -0000 1.2 *************** *** 4,8 **** ############################################################################### ! Project: "lua"=..\lua\src\lua\lua.dsp - Package Owner=<4> Package=<5> --- 4,8 ---- ############################################################################### ! Project: "lua"=..\..\..\modules\lua\src\lua\lua.dsp - Package Owner=<4> Package=<5> *************** *** 16,20 **** ############################################################################### ! Project: "lua50_wx26"=..\lua\lua50_wx26.dsp - Package Owner=<4> Package=<5> --- 16,20 ---- ############################################################################### ! Project: "lualib_wx26"=..\..\..\modules\lua\lualib_wx26.dsp - Package Owner=<4> Package=<5> *************** *** 28,32 **** ############################################################################### ! Project: "wxLuaLib_wx26"=..\src\wxLuaLib_wx26.dsp - Package Owner=<4> Package=<5> --- 28,32 ---- ############################################################################### ! Project: "wxLuaLib_wx26"=..\..\..\modules\wxlua\src\wxlualib_wx26.dsp - Package Owner=<4> Package=<5> *************** *** 40,44 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name lua50_wx26 End Project Dependency }}} --- 40,89 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "wxLuaDebugLib_wx26"=..\..\..\modules\wxluadebug\src\wxluadebug_wx26.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaLib_wx26 ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "wxLuaSocketLib_wx26"=..\..\..\modules\wxluasocket\src\wxluasocket_wx26.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name lualib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaLib_wx26 ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name wxLuaDebugLib_wx26 End Project Dependency }}} *************** *** 58,66 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name lua50_wx26 End Project Dependency Begin Project Dependency Project_Dep_Name wxLuaLib_wx26 End Project Dependency }}} --- 103,117 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name lualib_wx26 End Project Dependency Begin Project Dependency Project_Dep_Name wxLuaLib_wx26 End Project Dependency + Begin Project Dependency + Project_Dep_Name wxLuaDebugLib_wx26 + End Project Dependency + Begin Project Dependency + Project_Dep_Name wxLuaSocketLib_wx26 + End Project Dependency }}} |
