Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-05-04 20:36:31
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14401/build/msvc6 Modified Files: wxLua.dsw Log Message: Changed link order to lua, wxlua, wxbind, wxbindstc, wxluadebug, wxluasocket Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxLua.dsw 4 May 2007 17:39:21 -0000 1.4 --- wxLua.dsw 4 May 2007 20:36:24 -0000 1.5 *************** *** 34,40 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluadebug - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 34,37 ---- *************** *** 43,46 **** --- 40,46 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxluadebug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxluasocket End Project Dependency *************** *** 64,71 **** End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency }}} --- 64,71 ---- End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency ! Project_Dep_Name mod_wxluadebug End Project Dependency }}} *************** *** 88,94 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluadebug - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 88,91 ---- *************** *** 97,100 **** --- 94,100 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxluadebug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxluasocket End Project Dependency *************** *** 118,124 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluadebug - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 118,121 ---- *************** *** 127,130 **** --- 124,130 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxluadebug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxluasocket End Project Dependency *************** *** 220,226 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluadebug - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 220,223 ---- *************** *** 229,232 **** --- 226,232 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxluadebug + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxluasocket End Project Dependency |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/apps/build/msvc6 Modified Files: apps_app_lua.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: fix some more path problems as reported by John Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_wxluaedit.dsp 24 Apr 2007 14:39:44 -0000 1.3 --- apps_app_wxluaedit.dsp 4 May 2007 20:22:24 -0000 1.4 *************** *** 48,61 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 48,61 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" *************** *** 73,86 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 73,86 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Monolithic" *************** *** 98,111 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 98,111 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" *************** *** 123,136 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 123,136 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Monolithic" *************** *** 148,161 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 148,161 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" *************** *** 173,186 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 --- 173,186 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Monolithic" *************** *** 198,211 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\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 --- 198,211 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\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 *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" *************** *** 223,236 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\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 --- 223,236 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\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 *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Monolithic" *************** *** 248,261 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 248,261 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" *************** *** 273,286 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 273,286 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_dll\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Monolithic" *************** *** 298,311 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 --- 298,311 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\app_wxluaedit" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/apps/build/msvc8 Modified Files: apps_app_lua.vcproj apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: fix some more path problems as reported by John Index: apps_app_lua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_lua.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_lua.vcproj 24 Apr 2007 14:39:47 -0000 1.3 --- apps_app_lua.vcproj 4 May 2007 20:22:24 -0000 1.4 *************** *** 15,19 **** </ToolFiles> <Configurations> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu_dll\app_lua" Name="Release Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 15,19 ---- </ToolFiles> <Configurations> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu_dll\app_lua" Name="Release Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 21,32 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 21,32 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 34,38 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu_dll\app_lua" Name="Release Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 34,38 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu_dll\app_lua" Name="Release Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 40,51 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 40,51 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 53,57 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_lua" Name="Release Unicode Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 53,57 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_lua" Name="Release Unicode Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 59,70 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_lua\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 59,70 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_lua\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 72,76 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_lua" Name="Release Unicode Multilib|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 72,76 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswu\app_lua" Name="Release Unicode Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 78,89 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_lua\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 78,89 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu\app_lua\" Optimization="2" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 91,95 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw_dll\app_lua" Name="Release DLL Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 91,95 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw_dll\app_lua" Name="Release DLL Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 97,108 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 97,108 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 110,114 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw_dll\app_lua" Name="Release DLL Multilib|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 110,114 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw_dll\app_lua" Name="Release DLL Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 116,127 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 116,127 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\app_lua\" Optimization="2" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 129,133 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_lua" Name="Release Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 129,133 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_lua" Name="Release Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 135,146 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_lua\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 135,146 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_lua\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 148,152 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_lua" Name="Release Multilib|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 148,152 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmsw\app_lua" Name="Release Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 154,165 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_lua\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 154,165 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw\app_lua\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw\app_lua\" Optimization="2" PreprocessorDefinitions="__WXMSW__;_CONSOLE" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_CONSOLE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 167,171 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud_dll\app_lua" Name="Debug Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 167,171 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud_dll\app_lua" Name="Debug Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 173,184 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\app_lua\" Optimization="0" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 173,184 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\app_lua\" Optimization="0" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 186,190 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud_dll\app_lua" Name="Debug Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 186,190 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud_dll\app_lua" Name="Debug Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 192,203 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\app_lua\" Optimization="0" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 192,203 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\app_lua\" Optimization="0" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 205,209 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_lua" Name="Debug Unicode Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 205,209 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_lua" Name="Debug Unicode Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 211,222 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_lua\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 211,222 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_lua\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 224,228 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_lua" Name="Debug Unicode Multilib|Win32" OutputDirectory=".\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 224,228 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswud\app_lua" Name="Debug Unicode Multilib|Win32" OutputDirectory=".\..\..\..\bin\vc_lib" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 230,241 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_lua\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> --- 230,241 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud\app_lua\" Optimization="0" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\..\bin\vc_lib\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\lua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\bin\vc_lib\apps_app_lua.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCAppVerifierTool"/> *************** *** 243,247 **** <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswd_dll\app_lua" Name="Debug DLL Monolithic|Win32" OutputDirectory=".\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 243,247 ---- <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="1" IntermediateDirectory=".\vcmswd_dll\app_lua" Name="Debug DLL Monolithic|Win32" OutputDirectory=".\..\..\..\bin\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 249,260 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd_dll\app_lua\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd_dll\app_lua\" Optimization="0" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" ProgramDataBaseFileName="..\..\bin\vc_dll\lua.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\bin\vc_dll\lua.exe" ProgramDatabaseFile="..\..\bin\vc_dll\lua.pdb" SubSystem="1" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\bin\vc_dll\apps_app_lua.bsc" SuppressStartupBanner="tr... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:58
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/apps/build/bakefiles Modified Files: apps.bkl Log Message: fix some more path problems as reported by John Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** apps.bkl 24 Apr 2007 14:21:09 -0000 1.52 --- apps.bkl 4 May 2007 20:22:23 -0000 1.53 *************** *** 20,24 **** <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> ! <set var="WXLUA_BINDIR">../../bin</set> <set-srcdir>../..</set-srcdir> --- 20,24 ---- <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> ! <set var="WXLUA_BINDIR">../../../bin</set> <set-srcdir>../..</set-srcdir> *************** *** 128,135 **** <!-- Path to wxStedit headers & libs --> ! <if cond="TARGETING_WIN32=='1'"> ! <include>$(WXSTEDIT_DIR)/include</include> ! <lib-path>$(WXSTEDIT_DIR)/lib</lib-path> ! </if> <!-- Path to contrib headers --> --- 128,132 ---- <!-- Path to wxStedit headers & libs --> ! <wxlike-paths>$(WXSTEDIT_DIR)</wxlike-paths> <!-- Path to contrib headers --> |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:32
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fix some more path problems as reported by John Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.vc 24 Apr 2007 14:40:12 -0000 1.64 --- makefile.vc 4 May 2007 20:22:26 -0000 1.65 *************** *** 372,376 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(VAR) \ ! $(VAR_66) $(VAR_68) /Fd..\lib\vc_$(VAR_72)\wx.pdb /I..\..\..\modules \ /I.\..\..\.. /I$(LUA_DIR)\include /DWXMAKINGDLL_LUAMODULE /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) --- 372,376 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(VAR) \ ! $(VAR_66) $(VAR_68) /Fd..\..\..\lib\vc_$(VAR_72)\wx.pdb /I..\..\..\modules \ /I.\..\..\.. /I$(LUA_DIR)\include /DWXMAKINGDLL_LUAMODULE /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 496,500 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\lib\vc_$(VAR_72)\wx.dll !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 496,500 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_$(VAR_72)\wx.dll !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 737,743 **** -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\vc_$(VAR_72)\wx.dll del ..\lib\vc_$(VAR_72)\wx.dll ! -if exist ..\lib\vc_$(VAR_72)\wx.ilk del ..\lib\vc_$(VAR_72)\wx.ilk ! -if exist ..\lib\vc_$(VAR_72)\wx.pdb del ..\lib\vc_$(VAR_72)\wx.pdb test_for_selected_wxbuild: --- 737,743 ---- -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_$(VAR_65)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.dll del ..\..\..\lib\vc_$(VAR_72)\wx.dll ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.ilk del ..\..\..\lib\vc_$(VAR_72)\wx.ilk ! -if exist ..\..\..\lib\vc_$(VAR_72)\wx.pdb del ..\..\..\lib\vc_$(VAR_72)\wx.pdb test_for_selected_wxbuild: *************** *** 880,884 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\lib\vc_$(VAR_72)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_67) /LIBPATH:..\..\..\lib\vc_$(VAR_65) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib --- 880,884 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_$(VAR_72)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_67) /LIBPATH:..\..\..\lib\vc_$(VAR_65) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib *************** *** 887,891 **** make_dir_mod_luamodule: ! if not exist ..\lib\vc_$(VAR_72) mkdir ..\lib\vc_$(VAR_72) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c --- 887,891 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\vc_$(VAR_72) mkdir ..\..\..\lib\vc_$(VAR_72) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.bcc 24 Apr 2007 14:40:03 -0000 1.65 --- makefile.bcc 4 May 2007 20:22:26 -0000 1.66 *************** *** 455,459 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\lib\bcc_$(VAR_50)\wx.dll !endif !if "$(SHARED)" == "0" --- 455,459 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_50)\wx.dll !endif !if "$(SHARED)" == "0" *************** *** 708,717 **** -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\bcc_$(VAR_50)\wx.dll del ..\lib\bcc_$(VAR_50)\wx.dll ! -if exist ..\lib\bcc_$(VAR_50)\wx.tds del ..\lib\bcc_$(VAR_50)\wx.tds ! -if exist ..\lib\bcc_$(VAR_50)\wx.ilc del ..\lib\bcc_$(VAR_50)\wx.ilc ! -if exist ..\lib\bcc_$(VAR_50)\wx.ild del ..\lib\bcc_$(VAR_50)\wx.ild ! -if exist ..\lib\bcc_$(VAR_50)\wx.ilf del ..\lib\bcc_$(VAR_50)\wx.ilf ! -if exist ..\lib\bcc_$(VAR_50)\wx.ils del ..\lib\bcc_$(VAR_50)\wx.ils test_for_selected_wxbuild: --- 708,717 ---- -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.dll del ..\..\..\lib\bcc_$(VAR_50)\wx.dll ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.tds del ..\..\..\lib\bcc_$(VAR_50)\wx.tds ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilc del ..\..\..\lib\bcc_$(VAR_50)\wx.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ild del ..\..\..\lib\bcc_$(VAR_50)\wx.ild ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilf del ..\..\..\lib\bcc_$(VAR_50)\wx.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ils del ..\..\..\lib\bcc_$(VAR_50)\wx.ils test_for_selected_wxbuild: *************** *** 860,864 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\lib\bcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_44) -L$(LUA_DIR)\lib @&&| c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, --- 860,864 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_44) -L$(LUA_DIR)\lib @&&| c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, *************** *** 867,871 **** make_dir_mod_luamodule: ! if not exist ..\lib\bcc_$(VAR_50) mkdir ..\lib\bcc_$(VAR_50) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c --- 867,871 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\bcc_$(VAR_50) mkdir ..\..\..\lib\bcc_$(VAR_50) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.wat 24 Apr 2007 14:40:13 -0000 1.64 --- makefile.wat 4 May 2007 20:22:27 -0000 1.65 *************** *** 196,200 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\lib\wat_$(VAR_50)\wx.dll !endif !endif --- 196,200 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_$(VAR_50)\wx.dll !endif !endif *************** *** 826,830 **** -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\lib\wat_$(VAR_50)\wx.dll del ..\lib\wat_$(VAR_50)\wx.dll test_for_selected_wxbuild : --- 826,830 ---- -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_$(VAR_45)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_$(VAR_50)\wx.dll del ..\..\..\lib\wat_$(VAR_50)\wx.dll test_for_selected_wxbuild : *************** *** 1026,1030 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\lib\wat_$(VAR_50)\wx.dll : make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc option quiet --- 1026,1030 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_$(VAR_50)\wx.dll : make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule.lbc option quiet *************** *** 1041,1045 **** make_dir_mod_luamodule : ! if not exist ..\lib\wat_$(VAR_50) mkdir ..\lib\wat_$(VAR_50) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c --- 1041,1045 ---- make_dir_mod_luamodule : ! if not exist ..\..\..\lib\wat_$(VAR_50) mkdir ..\..\..\lib\wat_$(VAR_50) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj : .AUTODEPEND ..\..\lua\src\lapi.c Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.gcc 24 Apr 2007 14:40:10 -0000 1.64 --- makefile.gcc 4 May 2007 20:22:26 -0000 1.65 *************** *** 390,394 **** ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! __mod_luamodule___depname = ..\lib\gcc_$(VAR_50)\wx.dll endif endif --- 390,394 ---- ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! __mod_luamodule___depname = ..\..\..\lib\gcc_$(VAR_50)\wx.dll endif endif *************** *** 745,749 **** -if exist ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a del ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a ! -if exist ..\lib\gcc_$(VAR_50)\wx.dll del ..\lib\gcc_$(VAR_50)\wx.dll test_for_selected_wxbuild: --- 745,749 ---- -if exist ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\gcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a del ..\..\..\lib\gcc_$(VAR_44)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.a ! -if exist ..\..\..\lib\gcc_$(VAR_50)\wx.dll del ..\..\..\lib\gcc_$(VAR_50)\wx.dll test_for_selected_wxbuild: *************** *** 885,889 **** ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! ..\lib\gcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_44) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 885,889 ---- ifeq ($(SHARED),1) ifeq ($(USE_LUAMODULE),1) ! ..\..\..\lib\gcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) $(CXX) -shared -fPIC -o $@ $(MOD_LUAMODULE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) $(__THREADING) -L..\..\..\lib\gcc_$(VAR_44) -L$(LUA_DIR)\lib -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 891,895 **** make_dir_mod_luamodule: ! if not exist ..\lib\gcc_$(VAR_50) mkdir ..\lib\gcc_$(VAR_50) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c --- 891,895 ---- make_dir_mod_luamodule: ! if not exist ..\..\..\lib\gcc_$(VAR_50) mkdir ..\..\..\lib\gcc_$(VAR_50) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:31
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/modules/build/msvc6 Modified Files: modules_mod_luamodule.dsp Log Message: fix some more path problems as reported by John Index: modules_mod_luamodule.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_luamodule.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modules_mod_luamodule.dsp 24 Apr 2007 14:39:55 -0000 1.2 --- modules_mod_luamodule.dsp 4 May 2007 20:22:26 -0000 1.3 *************** *** 40,53 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 --- 40,53 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release Unicode DLL Multilib" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release Unicode DLL Multilib" *************** *** 65,78 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 --- 65,78 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Monolithic" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Monolithic" *************** *** 90,103 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 --- 90,103 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Multilib" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Release DLL Multilib" *************** *** 115,128 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 --- 115,128 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /mktyplib203 /win32 *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Monolithic" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Monolithic" *************** *** 140,153 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 --- 140,153 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Multilib" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug Unicode DLL Multilib" *************** *** 165,178 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 --- 165,178 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Monolithic" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Monolithic" *************** *** 190,203 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 --- 190,203 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 *************** *** 208,213 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Multilib" --- 208,213 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ELSEIF "$(CFG)" == "mod_luamodule - Win32 Debug DLL Multilib" *************** *** 215,228 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 --- 215,228 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_luamodule" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wx.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_LUAMODULE" /D "_DEBUG" /mktyplib203 /win32 *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wx.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /debug !ENDIF |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:31
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj Log Message: fix some more path problems as reported by John Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modules_mod_luamodule.vcproj 24 Apr 2007 14:39:59 -0000 1.2 --- modules_mod_luamodule.vcproj 4 May 2007 20:22:26 -0000 1.3 *************** *** 15,19 **** </ToolFiles> <Configurations> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswu_dll\mod_luamodule" Name="Release Unicode DLL Monolithic|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 15,19 ---- </ToolFiles> <Configurations> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswu_dll\mod_luamodule" Name="Release Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 21,36 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswu_dll\mod_luamodule" Name="Release Unicode DLL Multilib|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 21,36 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswu_dll\mod_luamodule" Name="Release Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 38,53 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmsw_dll\mod_luamodule" Name="Release DLL Monolithic|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 38,53 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmswu_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswu_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmsw_dll\mod_luamodule" Name="Release DLL Monolithic|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 55,70 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmsw_dll\mod_luamodule" Name="Release DLL Multilib|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 55,70 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmsw_dll\mod_luamodule" Name="Release DLL Multilib|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 72,87 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswud_dll\mod_luamodule" Name="Debug Unicode DLL Monolithic|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 72,87 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MD" AssemblerListingLocation=".\vcmsw_dll\mod_luamodule\" BasicRuntimeChecks="0" BufferSecurityCheck="false" DebugInformationFormat="0" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmsw_dll\mod_luamodule\" Optimization="2" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="2" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswud_dll\mod_luamodule" Name="Debug Unicode DLL Monolithic|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 89,104 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswud_dll\mod_luamodule" Name="Debug Unicode DLL Multilib|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 89,104 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswud_dll\mod_luamodule" Name="Debug Unicode DLL Multilib|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 106,121 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswd_dll\mod_luamodule" Name="Debug DLL Monolithic|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 106,121 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswud_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswud_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswd_dll\mod_luamodule" Name="Debug DLL Monolithic|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 123,138 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswd_dll\mod_luamodule" Name="Debug DLL Multilib|Win32" OutputDirectory=".\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> --- 123,138 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> </Configuration> ! <Configuration ATLMinimizesCRunTimeLibraryUsage="false" ConfigurationType="2" IntermediateDirectory=".\vcmswd_dll\mod_luamodule" Name="Debug DLL Multilib|Win32" OutputDirectory=".\..\..\..\lib\vc_dll" UseOfMFC="0"> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCCustomBuildTool"/> *************** *** 140,151 **** <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> --- 140,151 ---- <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCIDLTool"/> ! <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" AdditionalOptions=" /MDd" AssemblerListingLocation=".\vcmswd_dll\mod_luamodule\" BasicRuntimeChecks="3" DebugInformationFormat="3" Detect64BitPortabilityProblems="true" ExceptionHandling="1" InlineFunctionExpansion="1" Name="VCCLCompilerTool" ObjectFile=".\vcmswd_dll\mod_luamodule\" Optimization="0" PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG" ProgramDataBaseFileName="..\..\..\lib\vc_dll\wx.pdb" RuntimeLibrary="3" RuntimeTypeInfo="true" SuppressStartupBanner="true" WarningLevel="1"/> <Tool Name="VCManagedResourceCompilerTool"/> <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> ! <Tool Name="VCBscMakeTool" OutputFile=".\..\..\..\lib\vc_dll\modules_mod_luamodule.bsc" SuppressStartupBanner="true"/> <Tool Name="VCFxCopTool"/> <Tool Name="VCPostBuildEventTool"/> |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:30
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fix some more path problems as reported by John Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** makefile.vc 24 Apr 2007 14:39:50 -0000 1.63 --- makefile.vc 4 May 2007 20:22:25 -0000 1.64 *************** *** 102,106 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\bin\vc_$(____app_27)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ /I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) --- 102,106 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ /I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) *************** *** 110,114 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\bin\vc_$(____app_27)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) --- 110,114 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 120,124 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ --- 120,124 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ *************** *** 131,135 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\bin\vc_$(____app_27)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 131,135 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 144,150 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) /Fd..\..\bin\vc_$(____app_27)\wxluafreeze.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 144,150 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ ! $(____app_19) $(______app) \ ! /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 169,173 **** !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = ..\..\bin\vc_$(____app_27)\wxlua.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 169,173 ---- !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = ..\..\..\bin\vc_$(____app_27)\wxlua.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 178,182 **** !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = ..\..\bin\vc_$(____app_27)\wxluaedit.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 178,182 ---- !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 187,191 **** !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = ..\..\bin\vc_$(____app_27)\wxluacan.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 187,191 ---- !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = ..\..\..\bin\vc_$(____app_27)\wxluacan.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 196,200 **** !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = ..\..\bin\vc_$(____app_27)\wxluafreeze.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" --- 196,200 ---- !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe !endif !if "$(RUNTIME_LIBS)" == "dynamic" *************** *** 419,423 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\bin\vc_$(____app_27)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 419,423 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 425,443 **** -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! -if exist ..\..\bin\vc_$(____app_27)\lua.exe del ..\..\bin\vc_$(____app_27)\lua.exe ! -if exist ..\..\bin\vc_$(____app_27)\lua.ilk del ..\..\bin\vc_$(____app_27)\lua.ilk ! -if exist ..\..\bin\vc_$(____app_27)\lua.pdb del ..\..\bin\vc_$(____app_27)\lua.pdb ! -if exist ..\..\bin\vc_$(____app_27)\wxlua.exe del ..\..\bin\vc_$(____app_27)\wxlua.exe ! -if exist ..\..\bin\vc_$(____app_27)\wxlua.ilk del ..\..\bin\vc_$(____app_27)\wxlua.ilk ! -if exist ..\..\bin\vc_$(____app_27)\wxlua.pdb del ..\..\bin\vc_$(____app_27)\wxlua.pdb ! -if exist ..\..\bin\vc_$(____app_27)\wxluaedit.exe del ..\..\bin\vc_$(____app_27)\wxluaedit.exe ! -if exist ..\..\bin\vc_$(____app_27)\wxluaedit.ilk del ..\..\bin\vc_$(____app_27)\wxluaedit.ilk ! -if exist ..\..\bin\vc_$(____app_27)\wxluaedit.pdb del ..\..\bin\vc_$(____app_27)\wxluaedit.pdb ! -if exist ..\..\bin\vc_$(____app_27)\wxluacan.exe del ..\..\bin\vc_$(____app_27)\wxluacan.exe ! -if exist ..\..\bin\vc_$(____app_27)\wxluacan.ilk del ..\..\bin\vc_$(____app_27)\wxluacan.ilk ! -if exist ..\..\bin\vc_$(____app_27)\wxluacan.pdb del ..\..\bin\vc_$(____app_27)\wxluacan.pdb ! -if exist ..\..\bin\vc_$(____app_27)\wxluafreeze.exe del ..\..\bin\vc_$(____app_27)\wxluafreeze.exe ! -if exist ..\..\bin\vc_$(____app_27)\wxluafreeze.ilk del ..\..\bin\vc_$(____app_27)\wxluafreeze.ilk ! -if exist ..\..\bin\vc_$(____app_27)\wxluafreeze.pdb del ..\..\bin\vc_$(____app_27)\wxluafreeze.pdb test_for_selected_wxbuild: --- 425,443 ---- -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! -if exist ..\..\..\bin\vc_$(____app_27)\lua.exe del ..\..\..\bin\vc_$(____app_27)\lua.exe ! -if exist ..\..\..\bin\vc_$(____app_27)\lua.ilk del ..\..\..\bin\vc_$(____app_27)\lua.ilk ! -if exist ..\..\..\bin\vc_$(____app_27)\lua.pdb del ..\..\..\bin\vc_$(____app_27)\lua.pdb ! -if exist ..\..\..\bin\vc_$(____app_27)\wxlua.exe del ..\..\..\bin\vc_$(____app_27)\wxlua.exe ! -if exist ..\..\..\bin\vc_$(____app_27)\wxlua.ilk del ..\..\..\bin\vc_$(____app_27)\wxlua.ilk ! -if exist ..\..\..\bin\vc_$(____app_27)\wxlua.pdb del ..\..\..\bin\vc_$(____app_27)\wxlua.pdb ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe del ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluaedit.ilk del ..\..\..\bin\vc_$(____app_27)\wxluaedit.ilk ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb del ..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluacan.exe del ..\..\..\bin\vc_$(____app_27)\wxluacan.exe ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluacan.ilk del ..\..\..\bin\vc_$(____app_27)\wxluacan.ilk ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluacan.pdb del ..\..\..\bin\vc_$(____app_27)\wxluacan.pdb ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe del ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluafreeze.ilk del ..\..\..\bin\vc_$(____app_27)\wxluafreeze.ilk ! -if exist ..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb del ..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb test_for_selected_wxbuild: *************** *** 453,457 **** exit 1 ! ..\..\bin\vc_$(____app_27)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib --- 453,457 ---- exit 1 ! ..\..\..\bin\vc_$(____app_27)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib *************** *** 459,466 **** make_dir_app_lua: ! if not exist ..\..\bin\vc_$(____app_27) mkdir ..\..\bin\vc_$(____app_27) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib --- 459,466 ---- make_dir_app_lua: ! if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib *************** *** 469,477 **** make_dir_app_wxlua: ! if not exist ..\..\bin\vc_$(____app_27) mkdir ..\..\bin\vc_$(____app_27) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 469,477 ---- make_dir_app_wxlua: ! if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 479,486 **** make_dir_app_wxluaedit: ! if not exist ..\..\bin\vc_$(____app_27) mkdir ..\..\bin\vc_$(____app_27) !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib --- 479,486 ---- make_dir_app_wxluaedit: ! if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib *************** *** 489,496 **** make_dir_app_wxluacan: ! if not exist ..\..\bin\vc_$(____app_27) mkdir ..\..\bin\vc_$(____app_27) !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib --- 489,496 ---- make_dir_app_wxluacan: ! if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib *************** *** 499,503 **** make_dir_app_wxluafreeze: ! if not exist ..\..\bin\vc_$(____app_27) mkdir ..\..\bin\vc_$(____app_27) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c --- 499,503 ---- make_dir_app_wxluafreeze: ! if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** makefile.bcc 24 Apr 2007 14:39:49 -0000 1.63 --- makefile.bcc 4 May 2007 20:22:25 -0000 1.64 *************** *** 204,217 **** !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = ..\..\bin\bcc_$(____app_23)\wxlua.exe !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = ..\..\bin\bcc_$(____app_23)\wxluaedit.exe !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = ..\..\bin\bcc_$(____app_23)\wxluacan.exe !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = ..\..\bin\bcc_$(____app_23)\wxluafreeze.exe !endif !if "$(WX_SHARED)" == "0" --- 204,217 ---- !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! __app_wxlua___depname = ..\..\..\bin\bcc_$(____app_23)\wxlua.exe !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! __app_wxluaedit___depname = ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe !endif !if "$(USE_WXLUACANAPP)" == "1" ! __app_wxluacan___depname = ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" ! __app_wxluafreeze___depname = ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe !endif !if "$(WX_SHARED)" == "0" *************** *** 424,428 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\bin\bcc_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 424,428 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 430,463 **** -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm ! -if exist ..\..\bin\bcc_$(____app_23)\lua.exe del ..\..\bin\bcc_$(____app_23)\lua.exe ! -if exist ..\..\bin\bcc_$(____app_23)\lua.tds del ..\..\bin\bcc_$(____app_23)\lua.tds ! -if exist ..\..\bin\bcc_$(____app_23)\lua.ilc del ..\..\bin\bcc_$(____app_23)\lua.ilc ! -if exist ..\..\bin\bcc_$(____app_23)\lua.ild del ..\..\bin\bcc_$(____app_23)\lua.ild ! -if exist ..\..\bin\bcc_$(____app_23)\lua.ilf del ..\..\bin\bcc_$(____app_23)\lua.ilf ! -if exist ..\..\bin\bcc_$(____app_23)\lua.ils del ..\..\bin\bcc_$(____app_23)\lua.ils ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.exe del ..\..\bin\bcc_$(____app_23)\wxlua.exe ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.tds del ..\..\bin\bcc_$(____app_23)\wxlua.tds ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.ilc del ..\..\bin\bcc_$(____app_23)\wxlua.ilc ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.ild del ..\..\bin\bcc_$(____app_23)\wxlua.ild ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.ilf del ..\..\bin\bcc_$(____app_23)\wxlua.ilf ! -if exist ..\..\bin\bcc_$(____app_23)\wxlua.ils del ..\..\bin\bcc_$(____app_23)\wxlua.ils ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.exe del ..\..\bin\bcc_$(____app_23)\wxluaedit.exe ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.tds del ..\..\bin\bcc_$(____app_23)\wxluaedit.tds ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.ilc del ..\..\bin\bcc_$(____app_23)\wxluaedit.ilc ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.ild del ..\..\bin\bcc_$(____app_23)\wxluaedit.ild ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.ilf del ..\..\bin\bcc_$(____app_23)\wxluaedit.ilf ! -if exist ..\..\bin\bcc_$(____app_23)\wxluaedit.ils del ..\..\bin\bcc_$(____app_23)\wxluaedit.ils ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.exe del ..\..\bin\bcc_$(____app_23)\wxluacan.exe ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.tds del ..\..\bin\bcc_$(____app_23)\wxluacan.tds ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.ilc del ..\..\bin\bcc_$(____app_23)\wxluacan.ilc ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.ild del ..\..\bin\bcc_$(____app_23)\wxluacan.ild ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.ilf del ..\..\bin\bcc_$(____app_23)\wxluacan.ilf ! -if exist ..\..\bin\bcc_$(____app_23)\wxluacan.ils del ..\..\bin\bcc_$(____app_23)\wxluacan.ils ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.exe del ..\..\bin\bcc_$(____app_23)\wxluafreeze.exe ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.tds del ..\..\bin\bcc_$(____app_23)\wxluafreeze.tds ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.ilc del ..\..\bin\bcc_$(____app_23)\wxluafreeze.ilc ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.ild del ..\..\bin\bcc_$(____app_23)\wxluafreeze.ild ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.ilf del ..\..\bin\bcc_$(____app_23)\wxluafreeze.ilf ! -if exist ..\..\bin\bcc_$(____app_23)\wxluafreeze.ils del ..\..\bin\bcc_$(____app_23)\wxluafreeze.ils test_for_selected_wxbuild: --- 430,463 ---- -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.exe del ..\..\..\bin\bcc_$(____app_23)\lua.exe ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.tds del ..\..\..\bin\bcc_$(____app_23)\lua.tds ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ilc del ..\..\..\bin\bcc_$(____app_23)\lua.ilc ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ild del ..\..\..\bin\bcc_$(____app_23)\lua.ild ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ilf del ..\..\..\bin\bcc_$(____app_23)\lua.ilf ! -if exist ..\..\..\bin\bcc_$(____app_23)\lua.ils del ..\..\..\bin\bcc_$(____app_23)\lua.ils ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.exe del ..\..\..\bin\bcc_$(____app_23)\wxlua.exe ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.tds del ..\..\..\bin\bcc_$(____app_23)\wxlua.tds ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.ilc del ..\..\..\bin\bcc_$(____app_23)\wxlua.ilc ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.ild del ..\..\..\bin\bcc_$(____app_23)\wxlua.ild ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.ilf del ..\..\..\bin\bcc_$(____app_23)\wxlua.ilf ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxlua.ils del ..\..\..\bin\bcc_$(____app_23)\wxlua.ils ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.tds del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.tds ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ilc del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ilc ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ild del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ild ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ilf del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ilf ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ils del ..\..\..\bin\bcc_$(____app_23)\wxluaedit.ils ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe del ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.tds del ..\..\..\bin\bcc_$(____app_23)\wxluacan.tds ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.ilc del ..\..\..\bin\bcc_$(____app_23)\wxluacan.ilc ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.ild del ..\..\..\bin\bcc_$(____app_23)\wxluacan.ild ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.ilf del ..\..\..\bin\bcc_$(____app_23)\wxluacan.ilf ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluacan.ils del ..\..\..\bin\bcc_$(____app_23)\wxluacan.ils ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.tds del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.tds ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ilc del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ilc ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ild del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ild ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ilf del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ilf ! -if exist ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ils del ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.ils test_for_selected_wxbuild: *************** *** 473,477 **** exit 1 ! ..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, --- 473,477 ---- exit 1 ! ..\..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -ap @&&| c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, *************** *** 479,486 **** make_dir_app_lua: ! if not exist ..\..\bin\bcc_$(____app_23) mkdir ..\..\bin\bcc_$(____app_23) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res --- 479,486 ---- make_dir_app_lua: ! if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res *************** *** 489,497 **** make_dir_app_wxlua: ! if not exist ..\..\bin\bcc_$(____app_23) mkdir ..\..\bin\bcc_$(____app_23) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | --- 489,497 ---- make_dir_app_wxlua: ! if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ! ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | *************** *** 499,506 **** make_dir_app_wxluaedit: ! if not exist ..\..\bin\bcc_$(____app_23) mkdir ..\..\bin\bcc_$(____app_23) !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res --- 499,506 ---- make_dir_app_wxluaedit: ! if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) !if "$(USE_WXLUACANAPP)" == "1" ! ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res *************** *** 509,516 **** make_dir_app_wxluacan: ! if not exist ..\..\bin\bcc_$(____app_23) mkdir ..\..\bin\bcc_$(____app_23) !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res --- 509,516 ---- make_dir_app_wxluacan: ! if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) !if "$(USE_WXLUAFREEZEAPP)" == "1" ! ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res *************** *** 519,523 **** make_dir_app_wxluafreeze: ! if not exist ..\..\bin\bcc_$(____app_23) mkdir ..\..\bin\bcc_$(____app_23) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c --- 519,523 ---- make_dir_app_wxluafreeze: ! if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.wat 24 Apr 2007 14:39:51 -0000 1.64 --- makefile.wat 4 May 2007 20:22:25 -0000 1.65 *************** *** 129,133 **** !ifeq USE_WXLUAAPP 1 !ifeq USE_WXLUADEBUG 1 ! __app_wxlua___depname = ..\..\bin\wat_$(____app_23)\wxlua.exe !endif !endif --- 129,133 ---- !ifeq USE_WXLUAAPP 1 !ifeq USE_WXLUADEBUG 1 ! __app_wxlua___depname = ..\..\..\bin\wat_$(____app_23)\wxlua.exe !endif !endif *************** *** 136,149 **** !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAEDITAPP 1 ! __app_wxluaedit___depname = ..\..\bin\wat_$(____app_23)\wxluaedit.exe !endif !endif __app_wxluacan___depname = !ifeq USE_WXLUACANAPP 1 ! __app_wxluacan___depname = ..\..\bin\wat_$(____app_23)\wxluacan.exe !endif __app_wxluafreeze___depname = !ifeq USE_WXLUAFREEZEAPP 1 ! __app_wxluafreeze___depname = ..\..\bin\wat_$(____app_23)\wxluafreeze.exe !endif ____app = --- 136,149 ---- !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAEDITAPP 1 ! __app_wxluaedit___depname = ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe !endif !endif __app_wxluacan___depname = !ifeq USE_WXLUACANAPP 1 ! __app_wxluacan___depname = ..\..\..\bin\wat_$(____app_23)\wxluacan.exe !endif __app_wxluafreeze___depname = !ifeq USE_WXLUAFREEZEAPP 1 ! __app_wxluafreeze___depname = ..\..\..\bin\wat_$(____app_23)\wxluafreeze.exe !endif ____app = *************** *** 558,562 **** ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\bin\wat_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 558,562 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 566,574 **** -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! -if exist ..\..\bin\wat_$(____app_23)\lua.exe del ..\..\bin\wat_$(____app_23)\lua.exe ! -if exist ..\..\bin\wat_$(____app_23)\wxlua.exe del ..\..\bin\wat_$(____app_23)\wxlua.exe ! -if exist ..\..\bin\wat_$(____app_23)\wxluaedit.exe del ..\..\bin\wat_$(____app_23)\wxluaedit.exe ! -if exist ..\..\bin\wat_$(____app_23)\wxluacan.exe del ..\..\bin\wat_$(____app_23)\wxluacan.exe ! -if exist ..\..\bin\wat_$(____app_23)\wxluafreeze.exe del ..\..\bin\wat_$(____app_23)\wxluafreeze.exe test_for_selected_wxbuild : --- 566,574 ---- -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.ilk -if exist watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch del watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.pch ! -if exist ..\..\..\bin\wat_$(____app_23)\lua.exe del ..\..\..\bin\wat_$(____app_23)\lua.exe ! -if exist ..\..\..\bin\wat_$(____app_23)\wxlua.exe del ..\..\..\bin\wat_$(____app_23)\wxlua.exe ! -if exist ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe del ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe ! -if exist ..\..\..\bin\wat_$(____app_23)\wxluacan.exe del ..\..\..\bin\wat_$(____app_23)\wxluacan.exe ! -if exist ..\..\..\bin\wat_$(____app_23)\wxluafreeze.exe del ..\..\..\bin\wat_$(____app_23)\wxluafreeze.exe test_for_selected_wxbuild : *************** *** 584,588 **** exit 1 ! ..\..\bin\wat_$(____app_23)\lua.exe : make_dir_app_lua $(APP_LUA_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc option quiet --- 584,588 ---- exit 1 ! ..\..\..\bin\wat_$(____app_23)\lua.exe : make_dir_app_lua $(APP_LUA_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc option quiet *************** *** 597,606 **** make_dir_app_lua : ! if not exist ..\..\bin\wat_$(____app_23) mkdir ..\..\bin\wat_$(____app_23) !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 !ifeq USE_WXLUADEBUG 1 ! ..\..\bin\wat_$(____app_23)\wxlua.exe : make_dir_app_wxlua $(APP_WXLUA_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option quiet --- 597,606 ---- make_dir_app_lua : ! if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 !ifeq USE_WXLUADEBUG 1 ! ..\..\..\bin\wat_$(____app_23)\wxlua.exe : make_dir_app_wxlua $(APP_WXLUA_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option quiet *************** *** 618,631 **** make_dir_app_wxlua : ! if not exist ..\..\bin\wat_$(____app_23) mkdir ..\..\bin\wat_$(____app_23) !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAEDITAPP 1 ! ..\..\bin\wat_$(____app_23)\wxluaedit.exe : make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option quiet @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i --- 618,631 ---- make_dir_app_wxlua : ! if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAEDITAPP 1 ! ..\..\..\bin\wat_$(____app_23)\wxluaedit.exe : make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option quiet @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i *************** *** 637,644 **** make_dir_app_wxluaedit : ! if not exist ..\..\bin\wat_$(____app_23) mkdir ..\..\bin\wat_$(____app_23) !ifeq USE_WXLUACANAPP 1 ! ..\..\bin\wat_$(____app_23)\wxluacan.exe : make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option quiet --- 637,644 ---- make_dir_app_wxluaedit : ! if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) !ifeq USE_WXLUACANAPP 1 ! ..\..\..\bin\wat_$(____app_23)\wxluacan.exe : make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option quiet *************** *** 654,661 **** make_dir_app_wxluacan : ! if not exist ..\..\bin\wat_$(____app_23) mkdir ..\..\bin\wat_$(____app_23) !ifeq USE_WXLUAFREEZEAPP 1 ! ..\..\bin\wat_$(____app_23)\wxluafreeze.exe : make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option quiet --- 654,661 ---- make_dir_app_wxluacan : ! if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) !ifeq USE_WXLUAFREEZEAPP 1 ! ..\..\..\bin\wat_$(____app_23)\wxluafreeze.exe : make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option quiet *************** *** 671,675 **** make_dir_app_wxluafreeze : ! if not exist ..\..\bin\wat_$(____app_23) mkdir ..\..\bin\wat_$(____app_23) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj : .AUTODEPEND ..\..\..\modules\lua\src\lua.c --- 671,675 ---- make_dir_app_wxluafreeze : ! if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj : .AUTODEPEND ..\..\..\modules\lua\src\lua.c Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** makefile.gcc 24 Apr 2007 14:39:49 -0000 1.63 --- makefile.gcc 4 May 2007 20:22:25 -0000 1.64 *************** *** 150,154 **** ifeq ($(USE_WXLUAAPP),1) ifeq ($(USE_WXLUADEBUG),1) ! __app_wxlua___depname = ..\..\bin\gcc_$(____app_23)\wxlua.exe endif endif --- 150,154 ---- ifeq ($(USE_WXLUAAPP),1) ifeq ($(USE_WXLUADEBUG),1) ! __app_wxlua___depname = ..\..\..\bin\gcc_$(____app_23)\wxlua.exe endif endif *************** *** 156,167 **** ifeq ($(USE_WXBINDSTC),1) ifeq ($(USE_WXLUAEDITAPP),1) ! __app_wxluaedit___depname = ..\..\bin\gcc_$(____app_23)\wxluaedit.exe endif endif ifeq ($(USE_WXLUACANAPP),1) ! __app_wxluacan___depname = ..\..\bin\gcc_$(____app_23)\wxluacan.exe endif ifeq ($(USE_WXLUAFREEZEAPP),1) ! __app_wxluafreeze___depname = ..\..\bin\gcc_$(____app_23)\wxluafreeze.exe endif ifeq ($(WX_SHARED),0) --- 156,167 ---- ifeq ($(USE_WXBINDSTC),1) ifeq ($(USE_WXLUAEDITAPP),1) ! __app_wxluaedit___depname = ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe endif endif ifeq ($(USE_WXLUACANAPP),1) ! __app_wxluacan___depname = ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe endif ifeq ($(USE_WXLUAFREEZEAPP),1) ! __app_wxluafreeze___depname = ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe endif ifeq ($(WX_SHARED),0) *************** *** 506,519 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\bin\gcc_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d ! -if exist ..\..\bin\gcc_$(____app_23)\lua.exe del ..\..\bin\gcc_$(____app_23)\lua.exe ! -if exist ..\..\bin\gcc_$(____app_23)\wxlua.exe del ..\..\bin\gcc_$(____app_23)\wxlua.exe ! -if exist ..\..\bin\gcc_$(____app_23)\wxluaedit.exe del ..\..\bin\gcc_$(____app_23)\wxluaedit.exe ! -if exist ..\..\bin\gcc_$(____app_23)\wxluacan.exe del ..\..\bin\gcc_$(____app_23)\wxluacan.exe ! -if exist ..\..\bin\gcc_$(____app_23)\wxluafreeze.exe del ..\..\bin\gcc_$(____app_23)\wxluafreeze.exe test_for_selected_wxbuild: --- 506,519 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.o -if exist gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d del gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.d ! -if exist ..\..\..\bin\gcc_$(____app_23)\lua.exe del ..\..\..\bin\gcc_$(____app_23)\lua.exe ! -if exist ..\..\..\bin\gcc_$(____app_23)\wxlua.exe del ..\..\..\bin\gcc_$(____app_23)\wxlua.exe ! -if exist ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe del ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe ! -if exist ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe del ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe ! -if exist ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe del ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe test_for_selected_wxbuild: *************** *** 529,542 **** exit 1 ! ..\..\bin\gcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -mthreads -L... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:29
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/modules/build/bakefiles Modified Files: modules.bkl Log Message: fix some more path problems as reported by John Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** modules.bkl 24 Apr 2007 14:21:10 -0000 1.44 --- modules.bkl 4 May 2007 20:22:25 -0000 1.45 *************** *** 164,169 **** <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> ! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!--> ! <wxlua-dirname>../lib</wxlua-dirname> <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> --- 164,168 ---- <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> ! <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname> <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> |
|
From: Francesco M. <fr...@us...> - 2007-05-04 20:22:29
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles/presets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4461/build/bakefiles/presets Modified Files: wx_win32.bkl Log Message: fix some more path problems as reported by John Index: wx_win32.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_win32.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_win32.bkl 24 Apr 2007 14:29:46 -0000 1.1 --- wx_win32.bkl 4 May 2007 20:22:25 -0000 1.2 *************** *** 116,120 **** wxbase$(WX_VERSION)ud_$(value) </if> ! </set> </define-global-tag> --- 116,120 ---- wxbase$(WX_VERSION)ud_$(value) </if> ! </set> </define-global-tag> |
|
From: John L. <jr...@us...> - 2007-05-04 19:09:26
|
Update of /cvsroot/wxlua/website/download In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12770/download Modified Files: fixeol.sh Log Message: also change *.sln to DOS CRLF Index: fixeol.sh =================================================================== RCS file: /cvsroot/wxlua/website/download/fixeol.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fixeol.sh 24 May 2006 15:20:02 -0000 1.1 --- fixeol.sh 4 May 2007 19:09:21 -0000 1.2 *************** *** 16,19 **** --- 16,20 ---- for f in `find $dir|grep ".dsp"`; do $cmd $f; done for f in `find $dir|grep ".dsw"`; do $cmd $f; done + for f in `find $dir|grep ".sln"`; do $cmd $f; done for f in `find $dir|grep "makefile.vc"`; do $cmd $f; done for f in `find $dir|grep "makefile.wat"`; do $cmd $f; done |
|
From: John L. <jr...@us...> - 2007-05-04 19:04:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10286/wxLua/modules/wxlua/include Modified Files: wxldefs.h Log Message: add header to incircles.lua Bump version to 2.8.4 to match the upcomming wxWidgets release Fix wxlua_print function to respect __tostring metatable functions and match more closely luaL_print function using \t separators Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldefs.h 15 Mar 2007 00:01:25 -0000 1.15 --- wxldefs.h 4 May 2007 19:04:41 -0000 1.16 *************** *** 28,34 **** #define WXLUA_MAJOR_VERSION 2 #define WXLUA_MINOR_VERSION 8 ! #define WXLUA_RELEASE_VERSION 0 #define WXLUA_SUBRELEASE_VERSION 0 ! #define WXLUA_VERSION_STRING wxT("wxLua 2.8.0.0") // For non-Unix systems (i.e. when building without a configure script), --- 28,34 ---- #define WXLUA_MAJOR_VERSION 2 #define WXLUA_MINOR_VERSION 8 ! #define WXLUA_RELEASE_VERSION 4 #define WXLUA_SUBRELEASE_VERSION 0 ! #define WXLUA_VERSION_STRING wxT("wxLua 2.8.4.0") // For non-Unix systems (i.e. when building without a configure script), |
|
From: John L. <jr...@us...> - 2007-05-04 19:04:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10286/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: add header to incircles.lua Bump version to 2.8.4 to match the upcomming wxWidgets release Fix wxlua_print function to respect __tostring metatable functions and match more closely luaL_print function using \t separators Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** wxlstate.cpp 27 Apr 2007 20:26:57 -0000 1.95 --- wxlstate.cpp 4 May 2007 19:04:41 -0000 1.96 *************** *** 74,77 **** --- 74,78 ---- { wxLuaState wxlState(L); // doesn't have to be ok + wxString msg; int i, n = lua_gettop(L); *************** *** 81,126 **** for (i = 1; i <= n; i++) { ! if (i > 1) msg.Append(wxT(", ")); ! if (lua_isstring(L, i)) ! msg += lua2wx(lua_tostring(L, i)); ! else if (lua_isnumber(L, i)) ! msg += wxString::Format(wxT("%lf"), lua_tonumber(L, i)); ! else if (lua_iscfunction(L, i)) ! msg += wxString::Format(wxT("C function %ld"), (long int)lua_tocfunction(L, i)); ! else if (lua_isuserdata(L, i)) { ! msg += wxString::Format(wxT("User data %ld"), (long int)lua_touserdata(L, i)); ! if (wxlState.Ok()) { ! int nTag = wxlState.ttag(i); ! if (nTag != TLUA_NOTAG) ! { ! wxString name = wxlState.GetLuaTagName(nTag); ! if (!name.IsEmpty()) ! msg += wxString::Format(wxT(" (%s)"), name.c_str()); ! } } - } - else if (lua_isboolean(L, i)) - msg += lua_toboolean(L,i) ? wxT("true") : wxT("false"); - else if (lua_isnil(L,i)) - msg += wxT("nil"); - else if (lua_isnone(L,i)) - msg += wxT("unknown"); - else - msg += wxString::Format(wxT("%s:%p"), lua2wx(lua_typename(L,lua_type(L,i))).c_str(), lua_topointer(L,i)); } ! if (!msg.IsEmpty()) { ! if (wxlState.Ok()) ! { ! wxLuaEvent event(wxEVT_LUA_PRINT, wxlState.GetId(), wxlState); ! event.SetString(msg); ! wxlState.SendEvent( event ); ! } } --- 82,120 ---- for (i = 1; i <= n; i++) { ! // code copied from luaB_print in lbaselib.c ! if (i > 1) msg.Append(wxT("\t")); // lua uses a tab too in luaB_print ! const char *s; ! lua_pushvalue(L, -1); /* function to be called */ ! lua_pushvalue(L, i); /* value to print */ ! lua_call(L, 1, 1); ! s = lua_tostring(L, -1); /* get result */ ! if (s == NULL) { ! // FIXME use terror here? right now terror doesn't do anything special - JL ! return luaL_error(L, LUA_QL("tostring") " must return a string to " ! LUA_QL("print")); ! } ! msg += lua2wx(s); ! lua_pop(L, 1); /* pop result */ ! // if we know the type, add it ! if (lua_isuserdata(L, i) && wxlState.Ok()) ! { ! int nTag = wxlState.ttag(i); ! if (nTag != TLUA_NOTAG) { ! wxString name = wxlState.GetLuaTagName(nTag); ! if (!name.IsEmpty()) ! msg += wxString::Format(wxT(" (%s)"), name.c_str()); } } } ! if (!msg.IsEmpty() && wxlState.Ok()) { ! wxLuaEvent event(wxEVT_LUA_PRINT, wxlState.GetId(), wxlState); ! event.SetString(msg); ! wxlState.SendEvent(event); } |
|
From: John L. <jr...@us...> - 2007-05-04 19:04:45
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10286/wxLua/docs Modified Files: changelog.txt Log Message: add header to incircles.lua Bump version to 2.8.4 to match the upcomming wxWidgets release Fix wxlua_print function to respect __tostring metatable functions and match more closely luaL_print function using \t separators Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** changelog.txt 25 Apr 2007 02:52:20 -0000 1.26 --- changelog.txt 4 May 2007 19:04:41 -0000 1.27 *************** *** 3,7 **** =============== ! version 2.8.0.1 -------------------------------------------------------------------- --- 3,7 ---- =============== ! version 2.8.4.0 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-05-04 19:04:44
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/scripts In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10286/wxLua/apps/wxluacan/scripts Modified Files: incircles.lua Log Message: add header to incircles.lua Bump version to 2.8.4 to match the upcomming wxWidgets release Fix wxlua_print function to respect __tostring metatable functions and match more closely luaL_print function using \t separators Index: incircles.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/scripts/incircles.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** incircles.lua 27 Feb 2006 15:49:56 -0000 1.8 --- incircles.lua 4 May 2007 19:04:41 -0000 1.9 *************** *** 1,11 **** ! bluebrush = wx.wxBrushFromColourName("Blue", wx.wxSOLID) ! redbrush = wx.wxBrushFromColourName("Red", wx.wxSOLID) purplebrush = wx.wxBrushFromColourName("Purple", wx.wxSOLID) ! greenbrush = wx.wxBrushFromColourName("Green", wx.wxSOLID) ! bluepen = wx.wxPenFromColourName("Blue", 5, wx.wxSOLID) ! redpen = wx.wxPenFromColourName("Red", 2, wx.wxSOLID) ! purplepen = wx.wxPenFromColourName("Purple", 10, wx.wxSOLID) ! greenpen = wx.wxPenFromColourName("Green", 2, wx.wxSOLID) purplepen1p = wx.wxPenFromColourName("Purple", 1, wx.wxSOLID) --- 1,21 ---- + ----------------------------------------------------------------------------- + -- Name: incircles.lua + -- Purpose: Sample wxLua program for wxLua's wxluacan sample app + -- Author: Klaas Holwerda + -- Modified by: + -- Created: + -- RCS-ID: + -- Copyright: (c) 2005 Klaas Holwerda. All rights reserved. + -- Licence: wxWidgets licence + ----------------------------------------------------------------------------- ! bluebrush = wx.wxBrushFromColourName("Blue", wx.wxSOLID) ! redbrush = wx.wxBrushFromColourName("Red", wx.wxSOLID) purplebrush = wx.wxBrushFromColourName("Purple", wx.wxSOLID) ! greenbrush = wx.wxBrushFromColourName("Green", wx.wxSOLID) ! bluepen = wx.wxPenFromColourName("Blue", 5, wx.wxSOLID) ! redpen = wx.wxPenFromColourName("Red", 2, wx.wxSOLID) ! purplepen = wx.wxPenFromColourName("Purple", 10, wx.wxSOLID) ! greenpen = wx.wxPenFromColourName("Green", 2, wx.wxSOLID) purplepen1p = wx.wxPenFromColourName("Purple", 1, wx.wxSOLID) *************** *** 140,144 **** end - - - --- 150,151 ---- |
|
From: John L. <jr...@us...> - 2007-05-04 17:39:28
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8047/wxLua/build/msvc6 Modified Files: wxLua.dsw Log Message: Put wxluabind before wxluasocket since wxluasocket depends on it Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxLua.dsw 1 May 2007 14:23:33 -0000 1.3 --- wxLua.dsw 4 May 2007 17:39:21 -0000 1.4 *************** *** 37,43 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 37,40 ---- *************** *** 45,48 **** --- 42,48 ---- Project_Dep_Name mod_wxbindstc End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxluasocket + End Project Dependency }}} *************** *** 67,73 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 67,70 ---- *************** *** 94,100 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 91,94 ---- *************** *** 102,105 **** --- 96,102 ---- Project_Dep_Name mod_wxbindstc End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxluasocket + End Project Dependency }}} *************** *** 124,130 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 121,124 ---- *************** *** 132,135 **** --- 126,132 ---- Project_Dep_Name mod_wxbindstc End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxluasocket + End Project Dependency }}} |
|
From: John L. <jr...@us...> - 2007-05-04 16:12:28
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5429/wxLua/modules/luamodule/src Modified Files: luamodule.cpp Log Message: wxPrintf errors if we cannot initialize wxWidgets from a DLL Index: luamodule.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/luamodule.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** luamodule.cpp 4 Sep 2006 18:29:59 -0000 1.4 --- luamodule.cpp 4 May 2007 16:12:24 -0000 1.5 *************** *** 34,40 **** // Override the base class virtual functions ! bool OnInit(); ! int OnExit(); ! int MainLoop(); void OnLua( wxLuaEvent &event ); --- 34,40 ---- // Override the base class virtual functions ! virtual bool OnInit(); ! virtual int OnExit(); ! virtual int MainLoop(); void OnLua( wxLuaEvent &event ); *************** *** 107,114 **** if (!s_wxlState.Ok()) { ! int argc = 0; ! wxChar **argv = NULL; ! wxEntryStart(argc, argv); ! wxTheApp->CallOnInit(); wxTheApp->SetExitOnFrameDelete(true); --- 107,123 ---- if (!s_wxlState.Ok()) { ! int argc = 0; ! wxChar **argv = NULL; ! ! if (!wxEntryStart(argc, argv)) ! { ! wxPrintf(wxT("Error calling wxEntryStart(argc, argv), aborting.\n")); ! return 0; ! } ! if (!wxTheApp || !wxTheApp->CallOnInit()) ! { ! wxPrintf(wxT("Error calling wxTheApp->CallOnInit(), aborting.\n")); ! return 0; ! } wxTheApp->SetExitOnFrameDelete(true); |
|
From: John L. <jr...@us...> - 2007-05-03 21:05:42
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12878/docs Modified Files: binding.html wxlua.html Log Message: update docs and cleanup Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlua.html 1 May 2007 14:23:35 -0000 1.16 --- wxlua.html 3 May 2007 21:05:34 -0000 1.17 *************** *** 6,10 **** Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is ! a <a href="http://www.lua.org">lua</a> scripting language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> cross-platform GUI library. It consists of two IDE type editors that --- 6,11 ---- Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is ! a <a href="http://www.lua.org">Lua</a> ! scripting language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> cross-platform GUI library. It consists of two IDE type editors that *************** *** 13,34 **** running standalone wxLua ! scripts (wxLuaFreeze), a lua module to load using "require", and a library for extending C++ programs with a fast, small, fully ! embeddable scripting language.<br><h3>References:</h3> ! <a href="http://wxlua.sourceforge.net">http://wxlua.sourceforge.net</a><br> ! <a href="http://www.lua.org">http://www.lua.org</a><br> ! <a href="http://www.wxwidgets.org">http://www.wxwidgets.org</a><br><h2 style="text-decoration: underline;">Contents</h2><ol><li><a href="#The_wxLua_big_picture">The ! wxLua "big picture"</a></li><li><a href="#Version_Information">Version Information</a></li><li><a href="#wxLua_Requirements">Requirements</a></li><li><a href="#Introduction_to_Lua_very_brief">Introduction to Lua ! (very brief)</a></li><li><a href="#wxLua_Programming_in_Lua">Programming in wxLua</a></li><li><a href="#wxLua_Samples">wxLua Samples and How to Run Them</a></li><ol><li><a href="#How_to_run_the_samples">How to Run the Samples</a></li><li><a href="#Provided_samples">Provided Samples</a></li></ol><li><a href="#wxLua_Applications">wxLua Applications</a></li><ol><li><a href="#wxLua">wxLua</a></li><li><a href="#wxLuaFreeze">wxLuaFreeze</a></li><li><a href="#wxLuaEdit">wxLuaEdit</a></li></ol><li><a href="#wxLua_Utils">wxLua Utils</a></li><ol><li><a href="#bin2c.lua">bin2c.lua</a></li><li><a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a></li></ol><li><a href="#wxLua_Sourcecode_Modules">wxLua Sourcecode Modules</a></li><li><a href="#wxLua_Programming_in_C">wxLua C++ Programming Guide</a></li></ol><h2><a name="The_wxLua_big_picture"></a> ! <u>The wxLua "big picture"</u></h2> Lua is a small scripting language written in ANSI C that can load and run ! interpreted scripts as either files or strings. The language itself is ! very dynamic and contains a limited number of data types, mainly ! numbers, strings, and tables. Perhaps the most powerful feature of the ! lua language is that the tables can be used as either arrays or as ! hashtables that can cross-reference numbers, strings, functions, and/or subtables.<br> <br>wxLua adds to this small and elegant language the power of --- 14,33 ---- running standalone wxLua ! scripts (wxLuaFreeze), a lua module to load using "require" when using ! the standard lua executable, and a library for extending C++ programs with a fast, small, fully ! embeddable scripting language.<br><br> Lua is a small scripting language written in ANSI C that can load and run ! interpreted scripts as either files or strings. The Lua language is ! fast, dynamic, and easy to learn. Lua contains a limited ! number of data types, ! mainly numbers, strings, and tables. Perhaps the most powerful ! feature of the ! lua language is that the tables can be used as either arrays ! or hashtables that can cross-reference numbers, strings, ! functions, and/or subtables.<br> <br>wxLua adds to this small and elegant language the power of *************** *** 38,48 **** manipulation, sockets, displaying HTML, and printing to name a few. There is no special initialization required in lua and you can use as ! much or as little of wxWidgets as you like. ! <h2><a name="Version_Information"></a><u>Version Information</u></h2> ! <ul> <li>Lua 5.1.2</li> <ul> <li>wxLua uses an unmodified copy of Lua 5.1.2</li> <li>Any program that works using the official ! release of lua will work in wxLua.</li> </ul> <li>wxWidgets 2.8.3 (>= 2.6.3)</li> <ul> <li>The interface files have #ifdefs for 2.4, but --- 37,58 ---- manipulation, sockets, displaying HTML, and printing to name a few. There is no special initialization required in lua and you can use as ! much or as little of wxWidgets as you like.<br><h3>References:</h3> ! <a href="http://wxlua.sourceforge.net">http://wxlua.sourceforge.net</a> ! : wxLua website<br> ! <a href="http://www.lua.org">http://www.lua.org</a> ! : Lua website<br> ! <a href="http://www.wxwidgets.org">http://www.wxwidgets.org</a> ! : wxWidgets website<br> ! wxl...@li... : User and developer mailing list<br><h2 style="text-decoration: underline;">Contents</h2><ol><li><a href="#Version_Information">Version Information</a></li><li><a href="#wxLua_Requirements">Requirements</a></li><li><a href="#Introduction_to_Lua_very_brief">Introduction to Lua ! (very brief)</a></li><li><a href="#wxLua_Programming_in_Lua">Programming in wxLua</a></li><li><a href="#wxLua_Samples">wxLua Samples and How to Run Them</a></li><ol><li><a href="#How_to_run_the_samples">How to Run the Samples</a></li><li><a href="#Provided_samples">Provided Samples</a></li></ol><li><a href="#wxLua_Applications">wxLua Applications</a></li><ol><li><a href="#wxLua">wxLua</a></li><li><a href="#wxLuaFreeze">wxLuaFreeze</a></li><li><a href="#wxLuaEdit">wxLuaEdit</a></li></ol><li><a href="#wxLua_Utils">wxLua Utils</a></li><ol><li><a href="#bin2c.lua">bin2c.lua</a></li><li><a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a></li></ol><li><a href="#wxLua_Sourcecode_Modules">wxLua Sourcecode Modules</a></li><li><a href="#wxLua_Programming_in_C">wxLua C++ Programming Guide</a><br></li></ol><h2><a name="Version_Information"></a><u>Version Information</u></h2> ! <ul> <li>The wxLua ! version number is set to the stable version of ! wxWidgets that it has been updated to. It should also compile with ! newer versions of wxWidgets as well as older ones.</li><li>Lua ! 5.1.2</li> <ul> <li>wxLua uses an unmodified copy of Lua 5.1.2</li> <li>Any program that works using the official ! release of Lua will work in wxLua.</li> </ul> <li>wxWidgets 2.8.3 (>= 2.6.3)</li> <ul> <li>The interface files have #ifdefs for 2.4, but *************** *** 51,63 **** take advantage of the fixes and additions to newer versions of wxWidgets. With a little work you may be able to resurrect it to ! work. </li> <li>Note for wxWidgets < 2.9 : wxLua makes use of the wxStyledTextCtrl contrib library in wxWidgets/contrib/src/stc. You need to have compiled this into a library if you want to compile the wxLua apps. In wxWidgets >= ! 2.9 the wxStyledTextCtrl is now part of the main library.</li> </ul> ! <li>wxLua ! version number is set to the stable version of ! wxWidgets that it has been updated to. It should also compile with ! newer versions of wxWidgets as well as older ones. </li> </ul><h2><a name="wxLua_Requirements"></a><u>Requirements</u></h2> An end user of wxLua can use the binary packages of wxLua and --- 61,73 ---- take advantage of the fixes and additions to newer versions of wxWidgets. With a little work you may be able to resurrect it to ! work with wxWidgets 2.4. </li> <li>Note for wxWidgets ! < 2.9 : wxLua makes use of the wxStyledTextCtrl contrib library in wxWidgets/contrib/src/stc. You need to have compiled this into a library if you want to compile the wxLua apps. In wxWidgets >= ! 2.9 the wxStyledTextCtrl is now part of the main library.</li><li>The ! wxLua library links to these wxWidgets libs: stc, xrc, html, media, ! adv, net, xml, core, base, tiff, jpeg, png, zlib, regex, expat.</li><li>See ! install.html for more information.</li></ul> </ul><h2><a name="wxLua_Requirements"></a><u>Requirements</u></h2> An end user of wxLua can use the binary packages of wxLua and *************** *** 540,544 **** </ul></ul><h2><a name="wxLua_Samples"></a><u><u>wxLua Samples and How to Run Them</u></u></h2> ! There are a number of sample programs in the <i>samples</i> directory. These programs demonstrate how to write simple programs and try to show how to use some of the many classes of wxWidgets. They are --- 550,554 ---- </ul></ul><h2><a name="wxLua_Samples"></a><u><u>wxLua Samples and How to Run Them</u></u></h2> ! There are a number of sample programs in the <i style="font-style: italic;">wxLua/samples</i> directory. These programs demonstrate how to write simple programs and try to show how to use some of the many classes of wxWidgets. They are *************** *** 568,572 **** sample.wx.lua</span></li><li>Open the program in <span style="font-weight: bold;">wxlua.exe</span> and choose the menu item Run.</li><li>Open the program in <span style="font-weight: bold;">wxluaedit.exe</span> and ! press the |> play button to run it.</li><li>Use wxLua as a lua module (using require), run <span style="font-weight: bold; font-style: italic;">$lua.exe ../utils/wrapmodule/wrapmodule.wx.lua sample.wx.lua</span></li><ul><li>Note --- 578,583 ---- sample.wx.lua</span></li><li>Open the program in <span style="font-weight: bold;">wxlua.exe</span> and choose the menu item Run.</li><li>Open the program in <span style="font-weight: bold;">wxluaedit.exe</span> and ! select the menu item wxLua->Run or press the toolbar "play" ! button to run it.</li><li>Use wxLua as a lua module (using require), run <span style="font-weight: bold; font-style: italic;">$lua.exe ../utils/wrapmodule/wrapmodule.wx.lua sample.wx.lua</span></li><ul><li>Note *************** *** 608,612 **** function when wxLua is compiled as a shared library. Run this program using the lua executable and not wxLua or wxLuaFreeze since the wxLua ! library is loaded at run-time. See also <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a> for more information about loading lua modules.</li></ul><li><b>mdi.wx.lua</b></li> <ul><li>Shows the MDI classes, wxMDIParentFrame and wxMDIChildFrame.</li> --- 619,624 ---- function when wxLua is compiled as a shared library. Run this program using the lua executable and not wxLua or wxLuaFreeze since the wxLua ! library is loaded at run-time. See also <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a> ! for more information about loading lua modules.</li></ul><li><b>mdi.wx.lua</b></li> <ul><li>Shows the MDI classes, wxMDIParentFrame and wxMDIChildFrame.</li> *************** *** 642,646 **** </ul></ul><h2><a name="wxLua_Applications"></a><u>wxLua Applications</u></h2> ! The applications that wxLua provides are in the apps directory. These are C++ programs that are compiled against the wxWidgets library and the wxWidgets wxStyledTextCtrl library. <br> --- 654,659 ---- </ul></ul><h2><a name="wxLua_Applications"></a><u>wxLua Applications</u></h2> ! The applications that wxLua provides are in the <span style="font-style: italic;">wxLua/apps</span> ! directory. These are C++ programs that are compiled against the wxWidgets library and the wxWidgets wxStyledTextCtrl library. <br> *************** *** 785,789 **** </ul><h2><a name="wxLua_Utils"></a><u>wxLua Utils</u></h2> ! Utility programs for wxLua are located in the <i>util</i> directory. <ul> <li><h3><a name="bin2c.lua"></a>bin2c.lua</h3></li> --- 798,802 ---- </ul><h2><a name="wxLua_Utils"></a><u>wxLua Utils</u></h2> ! Utility programs for wxLua are located in the <i>wxLua/util</i> directory. <ul> <li><h3><a name="bin2c.lua"></a>bin2c.lua</h3></li> *************** *** 822,828 **** source code of lua itself. It is the original ! source for the version, with some of the header files copied to the ! include directory for the installation routines. </li> </ul> ! <li><b>wxbind</b></li> <ul> <li>The output of the interface files in <i>wxLua/bindings/wxwidgets</i> are generated in this directory. They are the wrappers to the wxWidgets --- 835,844 ---- source code of lua itself. It is the original ! unmodified source for the version, with some of the header files copied ! to the ! include directory for the installation routines. Patches released for ! the version are applied as they come out, see <span style="font-style: italic;">wxLua/docs/changelog.txt</span>. ! </li> </ul><li><b>wxbind</b></li> <ul> ! <li>The output of the interface files in <i>wxLua/bindings/wxwidgets</i> are generated in this directory. They are the wrappers to the wxWidgets *************** *** 861,871 **** the wxlua app.</li> <li>This lib depends on the wxluadebug lib.</li> </ul> ! </ul><h2><a name="wxLua_Programming_in_C"></a><u>wxLua C++ <u>Programming Guide</u></u></h2> The documentation for the wxLua library is in the header files and descriptions are given for each function, enum, etc. Please read through them to get a feel for ! what functions wxLua provides, but note that most of them are for ! internal use and are not generally useful. Below is just a quick synopsis of wxLua for C++ programmers.<br> <br>Lua uses char strings while wxWidgets uses the wxString class --- 877,887 ---- the wxlua app.</li> <li>This lib depends on the wxluadebug lib.</li> </ul> ! </ul><h2><a name="wxLua_Programming_in_C"></a><u>wxLua ! C++ <u>Programming Guide</u></u></h2> The documentation for the wxLua library is in the header files and descriptions are given for each function, enum, etc. Please read through them to get a feel for ! what functions wxLua provides. Below is a quick synopsis of wxLua for C++ programmers.<br> <br>Lua uses char strings while wxWidgets uses the wxString class *************** *** 881,885 **** wxLuaState derived from the wxWidget's wxObject class. The wxLuaState class ! contains as a member of it's ref data the 'C' lua_State which is the heart of lua. Since the class is ref counted, it should be passed as <i>const wxLuaState&</i> and can be used in much --- 897,902 ---- wxLuaState derived from the wxWidget's wxObject class. The wxLuaState class ! contains as a member of it's ref data the 'C' lua_State struct which is ! the heart of lua. Since the class is ref counted, it should be passed as <i>const wxLuaState&</i> and can be used in much *************** *** 909,934 **** easier to find in an editor. If you want the greatest performance just use wxLuaState::GetLuaState() and directly manipulate the ! returned lua_State. <br> <br>It is instructive to follow the creation of the wxLuaState by looking at bool wxLuaState::Create(wxEvtHandler *handler, wxWindowID id) in ! <i>wxLua/modules/wxlua/src/wxlstate.cpp</i>. The lua_State is created using ! lua_open() and then the lua libraries are loaded, base, table, string, ! math, and so on. The C lua_State is added to a hash table to allow looking up the owner wxLuaStateRefData when lua calls the C wxLua ! functions. A wxLua registry is created in lua's registry table. We ! register a print function to get the output of lua print() statements to send messages as wxLuaEvents, see ! wxEVT_LUA_PRINT. Finally the bindings are registered using ! derived versions of the wxLuaBinding class by iterating ! through the wxLuaBinding::GetBindingList() which has been filled by ! calling the wxLuaBinding_XXX_init() functions, see above about the ! wxbind module. YOU MUST ALWAYS KEEP THE SAME BINDINGS AND KEEP THEM IN THE SAME ORDER THROUGHOUT THE LIFE OF YOUR WXLUASTATES. This is because there is only one global int for each lua tag and if ! you change the bindings and create a new wxLuaState any previously ! created wxLuaStates will lookup classes using the wrong tags.<br> ! <br><b>Creating a wxLuaState</b><br> <ul> <li>wxLuaState(bool create = false)</li> <ul> <li>If create is false, default constructor, you must call --- 926,980 ---- easier to find in an editor. If you want the greatest performance just use wxLuaState::GetLuaState() and directly manipulate the ! returned pointer to the lua_State. <br> <br>It is instructive to follow the creation of the wxLuaState by looking at bool wxLuaState::Create(wxEvtHandler *handler, wxWindowID id) in ! <i>wxLua/modules/wxlua/src/wxlstate.cpp</i>.<br><ol><li>The ! wxObject::m_refData is created as a new wxLuaStateRefData(). This ref ! data class contains a pointer to the lua_State struct and to a shared ! wxLuaStateData class that is also created. If a lua program running in ! this wxLuaState creates coroutines, each will ! have their own wxLuaStateRefData and associated lua_State, but they ! will all share the same wxLuaStateData class. </li><li>The ! lua_State is created using ! lua_open() and then the standard lua libraries are loaded, base, table, ! string, ! math, and so on using luaL_openlibs(L). The C lua_State is added to a ! hash table to allow looking up the owner wxLuaStateRefData when lua calls the C wxLua ! binding functions with the lua_State as the only parameter. The ! wxLuaStateRefData is also pushed into the ! LUA_REGISTRYINDEX table as a lightuserdata using the ! "__wxLuaStateRefData key" as a secondary means to find the wxLuaState ! "owner" of the lua_State.</li><li>A wxLua registry is ! created in lua's LUA_REGISTRYINDEX table with the ! "wxLuaReferences" key. Items in this table are unique integer keys used ! to identify the wxWidgets (or other) classes used as userdata ! in wxLua. It is also used to store references to data that is not to be ! garbage collected until the reference is released.</li><li>We ! register a print() function for lua to get the output of lua print() statements to send messages as wxLuaEvents, see ! wxEVT_LUA_PRINT. </li><li>The bindings are ! registered by calling wxLuaState::RegisterBindings(true). </li><ul><li>Each ! binding that is loaded is a copy of derived wxLuaBinding ! classes that are installed when the wxLuaBinding_XXX_init() functions ! are called when the application is initialized (see above about the ! wxbind module). </li><li>YOU MUST ALWAYS KEEP THE ! SAME BINDINGS AND KEEP THEM IN THE SAME ORDER THROUGHOUT THE LIFE OF YOUR WXLUASTATES. This is because there is only one global int for each lua tag and if ! you change the bindings (or their order) and create a new wxLuaState ! any previously ! created wxLuaStates will lookup classes using the wrong overwritten ! tags.</li></ul><li>Each binding has ! wxLuaBinding::RegisterBinding(...) called for it.</li><ul><li>wxLuaBinding::RegisterFunctions(...) ! is called </li><li>A "namespace" table in lua (eg. wx) is ! created if necessary and a tag in the wxLuaRegistry is associated with ! it.</li><li>wxLuaBinding::RegisterGeneratedClasses() is ! called to actually push the bindings into lua.</li></ul><li>At ! the end of creation a wxLuaEvent is sent with the wxEVT_LUA_CREATION ! event type.</li></ol><b>Functions to ! Create a wxLuaState</b><br> <ul> <li>wxLuaState(bool create = false)</li> <ul> <li>If create is false, default constructor, you must call *************** *** 971,974 **** things up for wxLua first.</li> <li>Returns lua's error code LUA_ERRXXX or 0 on sucess</li> </ul> <li>The ! other functions are documented in wxlstate.h.</li> </ul></body></html> \ No newline at end of file --- 1017,1020 ---- things up for wxLua first.</li> <li>Returns lua's error code LUA_ERRXXX or 0 on sucess</li> </ul> <li>The ! other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> </ul></body></html> \ No newline at end of file Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** binding.html 9 Mar 2007 00:16:18 -0000 1.15 --- binding.html 3 May 2007 21:05:33 -0000 1.16 *************** *** 1,38 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html> ! <head> ! ! ! ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! ! ! [...2418 lines suppressed...] %__WXMOTIF20__<br> %__WXMAC__<br> %__WXMAC_CLASSIC__<br> %__WXMAC_CARBON__<br> %__WXMAC_OSX__<br> %__WXMGL__<br> %__WXMSW__<br> %__WXOS2__<br> %__WXOSX__<br> %__WXPALMOS__<br> %__WXPM__<br> %__WXSTUBS__<br> %__WXXT__<br> %__WXX11__<br> %__WXWINE__<br> %__WXUNIVERSAL__<br> %__X__<br> %__WXWINCE__<br> ! <br></body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2007-05-01 14:23:42
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7927/wxLua/build/msvc6 Modified Files: wxLua.dsw Log Message: updated docs to say how to run the samples and added an index cleaned up some of the modules wxLua.dsw - wxbind must be built before wxluasocket in the wxlua module shared library since the wxluasocket bindings depend on the wxWindow tag. Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxLua.dsw 23 Apr 2007 23:04:46 -0000 1.2 --- wxLua.dsw 1 May 2007 14:23:33 -0000 1.3 *************** *** 226,232 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxluasocket - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency --- 226,229 ---- *************** *** 234,237 **** --- 231,237 ---- Project_Dep_Name mod_wxbindstc End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_wxluasocket + End Project Dependency }}} |
|
From: John L. <jr...@us...> - 2007-05-01 14:23:41
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7927/wxLua/docs Modified Files: wxlua.html Log Message: updated docs to say how to run the samples and added an index cleaned up some of the modules wxLua.dsw - wxbind must be built before wxluasocket in the wxlua module shared library since the wxluasocket bindings depend on the wxWindow tag. Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlua.html 27 Apr 2007 20:26:57 -0000 1.15 --- wxlua.html 1 May 2007 14:23:35 -0000 1.16 *************** *** 1,24 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> <meta content="John Labenski" name="author"></head> ! ! <body><h2><u>wxLua Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">lua</a> scripting language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> ! cross-platform GUI library. It consists of two IDE type editors, an executable for running standalone wxLua ! scripts, a lua module to load using "require", and a library for extending C++ programs with a fast, small, fully ! embeddable scripting language.<br> ! <br><b>References:</b><br> <a href="http://wxlua.sourceforge.net">http://wxlua.sourceforge.net</a><br> <a href="http://www.lua.org">http://www.lua.org</a><br> ! <a href="http://www.wxwidgets.org">http://www.wxwidgets.org</a><br> ! <br><h2><u>The wxLua "big picture"</u></h2> ! Lua is an ANSI C compatible scripting language that can load and run interpreted scripts as either files or strings. The language itself is very dynamic and contains a limited number of data types, mainly --- 1,29 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLua ! Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">lua</a> scripting language wrapper around the <a href="http://www.wxwidgets.org">wxWidgets</a> ! cross-platform GUI library. It consists of two IDE type editors that ! can edit and run lua programs (wxLua and wxLuaEdit), an executable for running standalone wxLua ! scripts (wxLuaFreeze), a lua module to load using "require", and a ! library for extending C++ programs with a fast, small, fully ! embeddable scripting language.<br><h3>References:</h3> <a href="http://wxlua.sourceforge.net">http://wxlua.sourceforge.net</a><br> <a href="http://www.lua.org">http://www.lua.org</a><br> ! <a href="http://www.wxwidgets.org">http://www.wxwidgets.org</a><br><h2 style="text-decoration: underline;">Contents</h2><ol><li><a href="#The_wxLua_big_picture">The ! wxLua "big picture"</a></li><li><a href="#Version_Information">Version Information</a></li><li><a href="#wxLua_Requirements">Requirements</a></li><li><a href="#Introduction_to_Lua_very_brief">Introduction to Lua ! (very brief)</a></li><li><a href="#wxLua_Programming_in_Lua">Programming in wxLua</a></li><li><a href="#wxLua_Samples">wxLua Samples and How to Run Them</a></li><ol><li><a href="#How_to_run_the_samples">How to Run the Samples</a></li><li><a href="#Provided_samples">Provided Samples</a></li></ol><li><a href="#wxLua_Applications">wxLua Applications</a></li><ol><li><a href="#wxLua">wxLua</a></li><li><a href="#wxLuaFreeze">wxLuaFreeze</a></li><li><a href="#wxLuaEdit">wxLuaEdit</a></li></ol><li><a href="#wxLua_Utils">wxLua Utils</a></li><ol><li><a href="#bin2c.lua">bin2c.lua</a></li><li><a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a></li></ol><li><a href="#wxLua_Sourcecode_Modules">wxLua Sourcecode Modules</a></li><li><a href="#wxLua_Programming_in_C">wxLua C++ Programming Guide</a></li></ol><h2><a name="The_wxLua_big_picture"></a> ! <u>The wxLua "big picture"</u></h2> ! Lua is a small scripting language written in ANSI ! C that can load and run interpreted scripts as either files or strings. The language itself is very dynamic and contains a limited number of data types, mainly *************** *** 34,40 **** There is no special initialization required in lua and you can use as much or as little of wxWidgets as you like. ! <h2><u>Version Information</u></h2> <ul> <li>Lua 5.1.2</li> <ul> <li>wxLua ! uses an unmodified copy of lua 5.1.2</li> <li>Any program that works using the official release of lua will work in wxLua.</li> </ul> <li>wxWidgets --- 39,46 ---- There is no special initialization required in lua and you can use as much or as little of wxWidgets as you like. ! <h2><a name="Version_Information"></a><u>Version ! Information</u></h2> <ul> <li>Lua 5.1.2</li> <ul> <li>wxLua ! uses an unmodified copy of Lua 5.1.2</li> <li>Any program that works using the official release of lua will work in wxLua.</li> </ul> <li>wxWidgets *************** *** 48,56 **** wxLua makes use of the wxStyledTextCtrl contrib library in wxWidgets/contrib/src/stc. You need to have compiled this into a ! library if you want to compile the wxLua apps.</li> </ul> <li>wxLua version number is set to the stable version of wxWidgets that it has been updated to. It should also compile with newer versions of wxWidgets as well as older ones. </li> ! </ul><h2><u>wxLua Requirements</u></h2> An end user of wxLua can use the binary packages of wxLua and everything that's needed is contained within it. C++ programmers or --- 54,64 ---- wxLua makes use of the wxStyledTextCtrl contrib library in wxWidgets/contrib/src/stc. You need to have compiled this into a ! library if you want to compile the wxLua apps. In wxWidgets >= ! 2.9 the wxStyledTextCtrl is now part of the main library.</li> </ul> ! <li>wxLua version number is set to the stable version of wxWidgets that it has been updated to. It should also compile with newer versions of wxWidgets as well as older ones. </li> ! </ul><h2><a name="wxLua_Requirements"></a><u>Requirements</u></h2> An end user of wxLua can use the binary packages of wxLua and everything that's needed is contained within it. C++ programmers or *************** *** 58,63 **** development library of wxWidgets >=2.6.3, typically the source code itself that's been compiled on your system. More information about ! compiling wxLua is contained in the install.htm file. ! <h2><u>Introduction to Lua (very brief)</u></h2> Assuming that you have a cursory understanding of programming techniques, this primer should give you a good enough feel for lua to --- 66,72 ---- development library of wxWidgets >=2.6.3, typically the source code itself that's been compiled on your system. More information about ! compiling wxLua is contained in the install.htm file and on <a href="http://wxlua.sourceforge.net/">http://wxlua.sourceforge.net</a>. ! <h2><a name="Introduction_to_Lua_very_brief"></a><u>Introduction ! to Lua (very brief)</u></h2> Assuming that you have a cursory understanding of programming techniques, this primer should give you a good enough feel for lua to *************** *** 222,248 **** printHi() do return end; print("hi") end</i> which can be useful for debugging functions.</li> </ul> ! </ul><blockquote> <pre>do<br> -- create a new local scope<br> local a = 2<br>end<br></pre> ! </blockquote><ul> <li><b>if (bool) then ... elseif (bool) then ... else ... end</b></li> ! </ul><blockquote> <pre>local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b <= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</pre> ! </blockquote><ul> <ul> <li>There is no case statement, but a table[value] = function() ... end may be used to simulate one.</li> <blockquote> ! <pre>mycase = {}<br>mycase[1] = function() print("Hello #1") end<br>mycase[2] = function() print("Hello #2") end<br>...<br>if mycase[value] then<br> mycase[value]()<br>else<br> print("Unknown case value")<br>end</pre> ! </blockquote> </ul> <li><b>while (bool) ... end</b></li> <ul> <li>Note : there is no <i>continue</i> keyword only <i>break</i></li> </ul> ! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a < 10 do<br> print(a)<br> a = a + 1 -- no increment operator<br> if CheckA(a) then break end<br>end</pre> ! </blockquote><ul> <ul> <li>You can make a "fake" continue by doing this, doesn't print # 5.</li> </ul> ! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a < 10 do while true do<br> a = a + 1 -- no increment operator<br> if CheckA(a) then <br> break <br> else<br> print(a)<br> end<br>break end end</pre> ! </blockquote><ul> <li><b>repeat ... until (bool)</b></li> <ul> <li>Note : there is no continue keyword only break</li> </ul> ! </ul><blockquote> <pre>local a = 1<br>repeat<br> local temp = a * 2<br> print(temp, type(temp))<br> a = a + 1 -- no increment operator<br>until a > 10</pre> ! </blockquote><ul> <li><b>for var = init_value, end_value [, increment] do ... end</b></li> <ul> <li>Note : there is no --- 231,257 ---- printHi() do return end; print("hi") end</i> which can be useful for debugging functions.</li> </ul> ! </ul><blockquote> <pre>do<br> -- create a new local scope<br> local a = 2<br>end<br></pre></blockquote><ul><li><b>if ! (bool) then ... elseif (bool) then ... else ... end</b></li> ! </ul><blockquote> <pre>local a, b, c = 1, 2, 3 -- can assign multiple values<br>a = 1; b = 2; c = 3 -- use ; for multiple lines of code on single line<br>a, b, c = 1, 2, 3 -- this works too<br>if (a == 1) and ((b <= 2) or (c ~= 3)) then <br> print(a+b/c) <br>elseif a == 2 then -- no parentheses necessary<br> print(a)<br>else<br> print(b)<br>end</pre></blockquote><ul><ul><li>There ! is no case statement, but a table[value] = function() ... end may be used to simulate one.</li> <blockquote> ! <pre>mycase = {}<br>mycase[1] = function() print("Hello #1") end<br>mycase[2] = function() print("Hello #2") end<br>...<br>if mycase[value] then<br> mycase[value]()<br>else<br> print("Unknown case value")<br>end</pre></blockquote></ul><li><b>while ! (bool) ... end</b></li> <ul> <li>Note : there is no <i>continue</i> keyword only <i>break</i></li> </ul> ! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a < 10 do<br> print(a)<br> a = a + 1 -- no increment operator<br> if CheckA(a) then break end<br>end</pre></blockquote><ul><ul><li>You ! can make a "fake" continue by doing this, doesn't print # 5.</li> </ul> ! </ul><blockquote> <pre>function CheckA(val) if val == 5 then return true end end<br>local a = 1<br>while a < 10 do while true do<br> a = a + 1 -- no increment operator<br> if CheckA(a) then <br> break <br> else<br> print(a)<br> end<br>break end end</pre></blockquote><ul><li><b>repeat ! ... until (bool)</b></li> <ul> <li>Note : there is no continue keyword only break</li> </ul> ! </ul><blockquote> <pre>local a = 1<br>repeat<br> local temp = a * 2<br> print(temp, type(temp))<br> a = a + 1 -- no increment operator<br>until a > 10</pre></blockquote><ul><li><b>for ! var = init_value, end_value [, increment] do ... end</b></li> <ul> <li>Note : there is no *************** *** 252,257 **** it did before the loop. Copy the loop counter variable to a separate variable if you need to save it when breaking for example.</li> </ul> ! </ul><blockquote> <pre>local a = "hello"<br>for a = 1, 10 --[[, increment]] do -- optional increment value, else 1<br> -- the a here is local to the for loop and you CANNOT change it to affect the loop, use break<br> local temp = a * 2<br> print(temp)<br>end<br>print(a) -- a == "hello" since the a in the for loop above was local to the loop<br></pre> ! </blockquote><ul> <li><b>functions</b></li> <ul> <li>Input any number of values by value, tables are passed by --- 261,265 ---- it did before the loop. Copy the loop counter variable to a separate variable if you need to save it when breaking for example.</li> </ul> ! </ul><blockquote> <pre>local a = "hello"<br>for a = 1, 10 --[[, increment]] do -- optional increment value, else 1<br> -- the a here is local to the for loop and you CANNOT change it to affect the loop, use break<br> local temp = a * 2<br> print(temp)<br>end<br>print(a) -- a == "hello" since the a in the for loop above was local to the loop<br></pre></blockquote><ul><li><b>functions</b></li> <ul> <li>Input any number of values by value, tables are passed by *************** *** 263,268 **** receive return values that you do not want (eg. you only want the second return value, use _ for the first).</li> </ul> ! </ul><blockquote> <pre>function DoStuff(a, b, c)<br> a = b*c -- does not change global and/or input number a<br> local function Calc(a)<br> return a*2<br> end<br> <br> return Calc(a)*b*c -- or for multiple values "return a*b*c, a*b"<br>end<br>-- call function<br>a = 10<br>result = DoStuff(a, 1, 2)<br>-- can also put function into a table<br>stuff = {}<br>stuff.DoStuff = DoStuff<br>result = stuff.DoStuff(1, 2, 3)<br>print(a, result) -- "10, 72" since a is not changed</pre> ! </blockquote><h2><u>wxLua Programming in Lua</u></h2> Programming in wxLua means that you're writing lua programs using the lua --- 271,276 ---- receive return values that you do not want (eg. you only want the second return value, use _ for the first).</li> </ul> ! </ul><blockquote> <pre>function DoStuff(a, b, c)<br> a = b*c -- does not change global and/or input number a<br> local function Calc(a)<br> return a*2<br> end<br> <br> return Calc(a)*b*c -- or for multiple values "return a*b*c, a*b"<br>end<br>-- call function<br>a = 10<br>result = DoStuff(a, 1, 2)<br>-- can also put function into a table<br>stuff = {}<br>stuff.DoStuff = DoStuff<br>result = stuff.DoStuff(1, 2, 3)<br>print(a, result) -- "10, 72" since a is not changed</pre></blockquote><h2><a name="wxLua_Programming_in_Lua"></a><u>Programming ! in wxLua</u></h2> Programming in wxLua means that you're writing lua programs using the lua *************** *** 530,535 **** that creates a new wxRect, sets your extra functions for it, and returns it for use.</li> </ul> </ul> </ul> ! </ul> ! </ul><h2><u><u>wxLua Samples</u></u></h2> There are a number of sample programs in the <i>samples</i> directory. These programs demonstrate how to write simple programs and --- 538,543 ---- that creates a new wxRect, sets your extra functions for it, and returns it for use.</li> </ul> </ul> </ul> ! </ul></ul><h2><a name="wxLua_Samples"></a><u><u>wxLua ! Samples and How to Run Them</u></u></h2> There are a number of sample programs in the <i>samples</i> directory. These programs demonstrate how to write simple programs and *************** *** 540,544 **** be generally useful to the wxLua community. Please understand that any ! code you contribute has to be maintained and so try to keep things simple and clear.<br> <br>If something in wxLua seems to not work as expected it is --- 548,553 ---- be generally useful to the wxLua community. Please understand that any ! code you contribute has to be maintained and easily ! understood so try to keep things simple and clear.<br> <br>If something in wxLua seems to not work as expected it is *************** *** 546,552 **** to duplicate your error in the simplest possible way in one of the samples and ask on the <i>wxl...@li...</i> ! mailing list.<br> <ul> <li><b>calculator.wx.lua</b></li> <ul> ! <li>A simple calculator program the demonstrates loading an XRC resource, accelerator tables, and event handling.</li> </ul> <li><b>choices.wx.lua</b></li> <ul> <li>Demonstrates --- 555,581 ---- to duplicate your error in the simplest possible way in one of the samples and ask on the <i>wxl...@li...</i> ! mailing list.<br><br>Why are the samples named <span style="font-style: italic;">sample.wx.lua</span>? ! To allow them to be colorized correctly in syntax high-lighting ! editors, yet denote to people that they are for wxLua and must ! be run using the wxLua exectuable or the wxLua module. <br><h3><a name="How_to_run_the_samples"></a>How to Run the ! Samples</h3>The ! examples below are for MS Windows .exe executables, but the same ! applies for Linux or OSX, just remove the .exe extension for the ! executable. See also <a href="#wxLua_Applications">wxLua ! Applications</a> for more information about these programs.<ul><li>On ! the command line run <span style="font-weight: bold; font-style: italic;">$wxlua.exe ! sample.wx.lua</span></li><li>On the command line run <span style="font-weight: bold; font-style: italic;">$wxluafreeze.exe ! sample.wx.lua</span></li><li>Open the program in <span style="font-weight: bold;">wxlua.exe</span> and choose ! the menu item Run.</li><li>Open the program in <span style="font-weight: bold;">wxluaedit.exe</span> and ! press the |> play button to run it.</li><li>Use ! wxLua as a lua module (using require), run <span style="font-weight: bold; font-style: italic;">$lua.exe ! ../utils/wrapmodule/wrapmodule.wx.lua sample.wx.lua</span></li><ul><li>Note ! that <span style="font-weight: bold;">wrapmodule.wx.lua</span> ! is in the <span style="font-style: italic;">utils/wrapmodule</span> ! directory so you may have to specify a different path depending on ! where you are running lua.exe from. For more information see <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a>. </li></ul></ul><h3><a name="Provided_samples"></a>Provided Samples</h3> <ul> <li><b>calculator.wx.lua</b></li> <ul> ! <li>A simple calculator program the demonstrates loading and ! using controls from an XRC resource, accelerator tables, and event handling.</li> </ul> <li><b>choices.wx.lua</b></li> <ul> <li>Demonstrates *************** *** 557,575 **** demo of how to use coroutines in wxLua using wxEVT_IDLE to call coroutine.resume().</li></ul><li><b>debug.wx.lua</b></li> ! <ul> <li>TODO ?</li> </ul><li><b>dialog.wx.lua</b></li> <ul> <li>A simple temperature conversion program to/from Fahrenheit to/from Celsius. Shows the use of wxSizers, wxButtons, and the wxTextCtrl.</li> </ul> <li><b>editor.wx.lua</b></li> ! <ul> <li>This is the editor that the wxLua application in <i>apps/wxlua</i> ! uses.</li> </ul> <li><b>fldemo.wx.lua</b></li> <ul> <li>Deprecated, wxWidgets is not actively maintaining the docking library FL ! contrib and neither are we.</li> </ul> <li><b>grid.wx.lua</b></li> ! <ul> <li>A very simple demo of the wxGrid class.</li> </ul> <li><b>htmlwin.wx.lua</b></li> <ul> ! <li>Shows the wxLuaHtmlWindow and it's virtual functions.</li> ! </ul> <li><b>mdi.wx.lua</b></li> <ul> ! <li>Shows the MDI classes.</li> </ul> <li><b>minimal.wx.lua</b></li> <ul> <li>A minimal sample that creates a wxFrame, wxMenuBar, and --- 586,615 ---- demo of how to use coroutines in wxLua using wxEVT_IDLE to call coroutine.resume().</li></ul><li><b>debug.wx.lua</b></li> ! <ul> <li>Does not work... TODO ?</li> </ul><li><b>dialog.wx.lua</b></li> <ul> <li>A simple temperature conversion program to/from Fahrenheit to/from Celsius. Shows the use of wxSizers, wxButtons, and the wxTextCtrl.</li> </ul> <li><b>editor.wx.lua</b></li> ! <ul> <li>This is the editor that the wxLua application <i>apps/wxlua</i> ! uses. It uses the wxStyledTextCtrl for the editor and can run and debug ! lua programs. For more information see the wxLua application notes ! below. </li> </ul> <li><b>fldemo.wx.lua</b></li> <ul> <li>Deprecated, wxWidgets is not actively maintaining the docking library FL ! contrib and neither are we. This does not work.</li> </ul> ! <li><b>grid.wx.lua</b></li> ! <ul> <li>A very simple demo of the wxGrid class. A better ! one would be appreciated.</li> </ul> <li><b>htmlwin.wx.lua</b></li> <ul> ! <li>Shows the wxLuaHtmlWindow and it's virtual functions as well ! as adding.custom widgets to a wxHtmlWindow.</li> ! </ul> <li style="font-weight: bold;">luamodule.wx.lua</li><ul><li>A ! sample for the loading the wxLua "wx" module using lua's require ! function when wxLua is compiled as a shared library. Run this program ! using the lua executable and not wxLua or wxLuaFreeze since the wxLua ! library is loaded at run-time. See also <a href="#wrapmodule.wx.lua">wrapmodule.wx.lua</a> for more information about loading lua modules.</li></ul><li><b>mdi.wx.lua</b></li> ! <ul><li>Shows the MDI classes, wxMDIParentFrame and ! wxMDIChildFrame.</li> ! </ul> <li><b>minimal.wx.lua</b></li> <ul> <li>A minimal sample that creates a wxFrame, wxMenuBar, and *************** *** 579,586 **** some wxDC drawing classes in wxLua.</li> </ul> <li><b>scribble.wx.lua</b></li> ! <ul> <li>A simple drawing program that shows wxMouseEvents and ! wxDC drawing.</li> </ul> <li><b>sizer.wx.lua</b></li> ! <ul> <li>A wxSizer demonstration.</li> </ul> <li><b>tree.wx.lua</b></li> <ul> <li>A wxTreeCtrl demonstration.</li> </ul> <li><b>unittest.wx.lua</b></li> <ul> <li>Tests --- 619,629 ---- some wxDC drawing classes in wxLua.</li> </ul> <li><b>scribble.wx.lua</b></li> ! <ul> <li>A simple drawing program that shows how to handle ! wxMouseEvents and ! wxDC drawing as well as creating a custom control.</li> </ul> ! <li><b>sizer.wx.lua</b></li> ! <ul> <li>A simple wxSizer demonstration.</li> </ul> ! <li><b>tree.wx.lua</b></li> <ul> <li>A wxTreeCtrl demonstration.</li> </ul> <li><b>unittest.wx.lua</b></li> <ul> <li>Tests *************** *** 596,606 **** two separate lua tables to make things easier to understand. The sudoku solver code is in the "sudoku" table at the top of the listing and the ! wxWidgets GUI code in the "sudokuGUI" table at the bottom. </li> ! </ul> ! </ul><h2><u>wxLua Applications</u></h2> The applications that wxLua provides are in the apps directory. These are C++ programs that are compiled against the wxWidgets library and the wxWidgets wxStyledTextCtrl library. <br> ! <ul> <li><b>wxLua</b></li> <ul> <li>This is a wxLua IDE editor program written in lua that has a --- 639,650 ---- two separate lua tables to make things easier to understand. The sudoku solver code is in the "sudoku" table at the top of the listing and the ! wxWidgets GUI code in the "sudokuGUI" table at the bottom.</li> ! </ul></ul><h2><a name="wxLua_Applications"></a><u>wxLua ! Applications</u></h2> The applications that wxLua provides are in the apps directory. These are C++ programs that are compiled against the wxWidgets library and the wxWidgets wxStyledTextCtrl library. <br> ! <ul> <li><h3><a name="wxLua"></a>wxLua</h3></li> ! <ul> <li>This is a wxLua IDE editor program written in lua that has a *************** *** 684,688 **** lua arg table starts with [1] = '--' which should probably be ignored.</li> ! </ul> </ul> </ul> </ul> <li><b>wxLuaEdit</b></li> <ul> <li>This is another IDE type program written in C++ that runs --- 728,732 ---- lua arg table starts with [1] = '--' which should probably be ignored.</li> ! </ul> </ul> </ul> </ul> <li><h3><a name="wxLuaEdit"></a>wxLuaEdit</h3></li> <ul> <li>This is another IDE type program written in C++ that runs *************** *** 718,723 **** need to download either the newest version or use CVS to get a copy from wxcode.sourceforge.net in order to compile this editor.</li> ! </ul> <li><b>wxLuaFreeze</b></li> <ul> ! <li>This is the simplest incarnation of a wxLua program that makes use of the wxLua library. Once compiled it can run lua programs on the command line as <i>$wxLuaFreeze program.lua</i>. --- 762,768 ---- need to download either the newest version or use CVS to get a copy from wxcode.sourceforge.net in order to compile this editor.</li> ! </ul> <li><h3><a name="wxLuaFreeze"></a>wxLuaFreeze</h3></li> ! <ul><li>This is the simplest incarnation of a wxLua program ! that makes use of the wxLua library. Once compiled it can run lua programs on the command line as <i>$wxLuaFreeze program.lua</i>. *************** *** 738,751 **** upx can be used to compress the executable to about 1.5 Mb from 4.5 Mb, using VC6 in release mode as the compiler.</li> </ul> ! </ul><h2><u>wxLua Utils</u></h2> Utility programs for wxLua are located in the <i>util</i> directory. ! <ul> <li><b>bin2c</b></li> <ul> <li>bin2c.lua is a lua program to convert a file into a const char* string to be included into a C/C++ program. You can then run the script in C++ by calling <i>wxLuaState::LuaDoBuffer(string_var, string_len, "Lua program")</i>. Help is given if no arguments are ! given when run or you can read its Usage() function.</li> </ul> ! </ul><h2><u>wxLua Sourcecode Modules</u></h2> wxLua is broken up into "modules" that are compiled into libraries so that you can choose to link to some or all of them. The directory --- 783,816 ---- upx can be used to compress the executable to about 1.5 Mb from 4.5 Mb, using VC6 in release mode as the compiler.</li> </ul> ! </ul><h2><a name="wxLua_Utils"></a><u>wxLua ! Utils</u></h2> Utility programs for wxLua are located in the <i>util</i> directory. ! <ul> <li><h3><a name="bin2c.lua"></a>bin2c.lua</h3></li> ! <ul> <li>bin2c.lua is a lua program to convert a file into a const char* string to be included into a C/C++ program. You can then run the script in C++ by calling <i>wxLuaState::LuaDoBuffer(string_var, string_len, "Lua program")</i>. Help is given if no arguments are ! given when run or you can read its Usage() function.</li> </ul><li><h3><a name="wrapmodule.wx.lua"></a>wrapmodule.wx.lua</h3></li><ul><li>This ! is a wrapper program to allow you to use the wx shared library as a lua ! module (using require) to run the provided samples without having to ! edit them. See <a href="#How_to_run_the_samples">How to ! Run the Samples</a> for other ways to run the samples.</li><li>The ! search path for the module may need to be specified if it is not in the ! same directory as the sample you want to run.</li><ul><li>You ! can add a line like this to the top of wrapmodule.wx.lua (adjusted as ! necessary) for your paths.</li><li>The list of paths is a ! semicolon separated list of paths to <span style="font-weight: bold;">?.so</span> (for unix type ! shared libraries) and <span style="font-weight: bold;">?.dll</span> ! (for MSW) .</li><li>? is equivalent to * meaning match ! anything for typical shells (DOS prompt).</li><li>You might ! as well include paths to both unix and MSW libraries so that the script ! can be run on either platform without modification since typically only ! the libraries that work on any given platform will be installed.</li><li>package.cpath ! = ! ";;../lib/?.so;../lib/vc_dll/?.dll;../lib/bcc_dll/?.dll;../lib/mingw_dll/?.dll;"</li></ul></ul> ! </ul><h2><a name="wxLua_Sourcecode_Modules"></a><u>wxLua ! Sourcecode Modules</u></h2> wxLua is broken up into "modules" that are compiled into libraries so that you can choose to link to some or all of them. The directory *************** *** 796,800 **** the wxlua app.</li> <li>This lib depends on the wxluadebug lib.</li> </ul> ! </ul><h2><u>wxLua Programming in C++</u></h2> The documentation for the wxLua library is in the header files and descriptions are given for each function, enum, etc. Please --- 861,866 ---- the wxlua app.</li> <li>This lib depends on the wxluadebug lib.</li> </ul> ! </ul><h2><a name="wxLua_Programming_in_C"></a><u>wxLua C++ <u>Programming ! Guide</u></u></h2> The documentation for the wxLua library is in the header files and descriptions are given for each function, enum, etc. Please *************** *** 906,909 **** code LUA_ERRXXX or 0 on sucess</li> </ul> <li>The other functions are documented in wxlstate.h.</li> ! </ul><br> ! </body></html> \ No newline at end of file --- 972,974 ---- code LUA_ERRXXX or 0 on sucess</li> </ul> <li>The other functions are documented in wxlstate.h.</li> ! </ul></body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2007-05-01 14:23:40
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7927/wxLua/samples Modified Files: coroutine.wx.lua dialog.wx.lua htmlwin.wx.lua tree.wx.lua Log Message: updated docs to say how to run the samples and added an index cleaned up some of the modules wxLua.dsw - wxbind must be built before wxluasocket in the wxlua module shared library since the wxluasocket bindings depend on the wxWindow tag. Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** htmlwin.wx.lua 21 Dec 2006 20:14:20 -0000 1.11 --- htmlwin.wx.lua 1 May 2007 14:23:35 -0000 1.12 *************** *** 8,13 **** -------------------------------------------------------------------------=--- ! frame = nil ! html = nil htmlTextPage = --- 8,13 ---- -------------------------------------------------------------------------=--- ! frame = nil -- the main frame of the program ! html = nil -- the wxLuaHtmlWindow child of the frame (subclassed wxHtmlWindow) htmlTextPage = *************** *** 49,53 **** local parent = nil if wx.wxCHECK_VERSION(2,7,0) then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() else parent = event.HtmlParser.Window --- 49,62 ---- local parent = nil if wx.wxCHECK_VERSION(2,7,0) then ! if event:GetHtmlParser() and event:GetHtmlParser():GetWindowInterface() ! and event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() then ! ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() ! else ! print("FIXME: wxWidgets does not provide the html window for print previews?") ! print("1:", event:GetHtmlParser()) ! print("2:", event:GetHtmlParser():GetWindowInterface()) ! print("3:", event:GetHtmlParser():GetWindowInterface():GetHTMLWindow()) ! end else parent = event.HtmlParser.Window *************** *** 62,66 **** wnd:Show(true) - print(wnd, type(fl)) -- create the container widget cell local widget = wx.wxHtmlWidgetCell(wnd, fl) --- 71,74 ---- *************** *** 74,78 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua HtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 82,86 ---- -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLuaHtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 94,98 **** menuBar:Append(helpMenu, "&Help") ! -- insert the menu bar into the frame frame.MenuBar = menuBar --- 102,106 ---- menuBar:Append(helpMenu, "&Help") ! -- insert the menu bar into the frame using the %property binding tag (eg. SetMenubar function) frame.MenuBar = menuBar *************** *** 133,136 **** --- 141,146 ---- html = wx.wxLuaHtmlWindow(frame) + -- Override the virtual function + -- virtual void wxLuaHtmlWindow::OnSetTitle(const wxString& title) html.OnSetTitle = function(self, title) frame.Title = frame.Title.." - "..title *************** *** 140,144 **** -- will be invoked wx.wxGetApp():Connect(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, ! function (event) CreateBoundWindow(event) end) -- set the frame window and status bar --- 150,154 ---- -- will be invoked wx.wxGetApp():Connect(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, ! function (event) CreateBoundWindow(event) end) -- set the frame window and status bar *************** *** 152,155 **** wx.wxGetApp().TopWindow = frame frame:Show(true) - - --- 162,163 ---- Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dialog.wx.lua 8 Mar 2007 20:34:04 -0000 1.10 --- dialog.wx.lua 1 May 2007 14:23:35 -0000 1.11 *************** *** 46,50 **** flexGridSizer:AddWindow( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) flexGridSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( button, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl --- 46,50 ---- flexGridSizer:AddWindow( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) flexGridSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( button, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl *************** *** 112,117 **** -- NOTE: Since we Connect() the about and close buttons after this they will be -- called first and unless we call event:Skip() in their handlers the ! -- events will never reach this function. Therefore we don't bother to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, --- 112,117 ---- -- NOTE: Since we Connect() the about and close buttons after this they will be -- called first and unless we call event:Skip() in their handlers the ! -- events will never reach this function. Therefore we don't need to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, *************** *** 137,144 **** local Tc, Tk, Tf, Tr = TempCase[event:GetId()]() ! celsiusTextCtrl:SetValue(string.format("%.3f", Tc)) ! kelvinTextCtrl:SetValue(string.format("%.3f", Tk)) fahrenheitTextCtrl:SetValue(string.format("%.3f", Tf)) ! rankineTextCtrl:SetValue(string.format("%.3f", Tr)) end end) --- 137,144 ---- local Tc, Tk, Tf, Tr = TempCase[event:GetId()]() ! celsiusTextCtrl:SetValue( string.format("%.3f", Tc)) ! kelvinTextCtrl:SetValue( string.format("%.3f", Tk)) fahrenheitTextCtrl:SetValue(string.format("%.3f", Tf)) ! rankineTextCtrl:SetValue( string.format("%.3f", Tr)) end end) Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tree.wx.lua 21 Dec 2006 20:14:21 -0000 1.8 --- tree.wx.lua 1 May 2007 14:23:35 -0000 1.9 *************** *** 54,58 **** -- create our treectrl tree = wx.wxTreeCtrl( frame, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxTR_LINES_AT_ROOT + wx.wxTR_HAS_BUTTONS ) --- 54,58 ---- -- create our treectrl tree = wx.wxTreeCtrl( frame, wx.wxID_ANY, ! wx.wxDefaultPosition, wx.wxSize(-1, 200), wx.wxTR_LINES_AT_ROOT + wx.wxTR_HAS_BUTTONS ) Index: coroutine.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/coroutine.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** coroutine.wx.lua 21 Dec 2006 20:14:20 -0000 1.4 --- coroutine.wx.lua 1 May 2007 14:23:35 -0000 1.5 *************** *** 13,42 **** ProgressWindow = { ! -- The 'wxDialog' being encapsulated by this class. dialog = nil, ! -- The label telling what's going on ("Processing thing 7/88...") label = nil, } ! -- The constructor. 'parent' is the parent window. 'workCoroutine' is the ! -- coroutine used to process whatever is desired. 'caption' is the caption to be ! -- used for this window. 'initialLabel' is the string that will be initially ! -- shown in the window. ! function ProgressWindow:new (parent, workCoroutine, caption, initialLabel) -- simple little sanity test to ensure that we can call binding functions ! -- it will fail on r:SetX if wx bindings aren't set for the coroutine local r = wx.wxRect(1,2,3,4) r:SetX(1) local o = { } ! setmetatable (o, self) self.__index = self ! -- Check parameters ! assert (type (workCoroutine) == "thread") ! assert (type (caption) == "string") ! assert (type (initialLabel) == "string") -- Create dialog --- 13,43 ---- ProgressWindow = { ! -- The 'wxDialog' being encapsulated by this "class". dialog = nil, ! -- The label telling what's going on ("Processing 7/10...") label = nil, } ! -- The constructor for the progress dialog. ! -- 'parent' is the parent window. ! -- 'workCoroutine' is the coroutine used to process whatever is desired. ! -- 'caption' is the caption to be used for this window. ! -- 'initialLabel' is the string that will be initially shown in the window. ! function ProgressWindow:new(parent, workCoroutine, caption, initialLabel) -- simple little sanity test to ensure that we can call binding functions ! -- fails on r:SetX if wx bindings aren't installed correctly for the coroutine local r = wx.wxRect(1,2,3,4) r:SetX(1) local o = { } ! setmetatable(o, self) self.__index = self ! -- Check input parameters ! assert(type(workCoroutine) == "thread") ! assert(type(caption) == "string") ! assert(type(initialLabel) == "string") -- Create dialog *************** *** 45,51 **** wx.wxDEFAULT_DIALOG_STYLE) ! o.label = wx.wxTextCtrl (o.dialog, wx.wxID_ANY, "", ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxTE_MULTILINE + wx.wxTE_READONLY) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) mainSizer:AddWindow(o.label, 1, wx.wxGROW) --- 46,52 ---- wx.wxDEFAULT_DIALOG_STYLE) ! o.label = wx.wxTextCtrl(o.dialog, wx.wxID_ANY, "", ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxTE_MULTILINE + wx.wxTE_READONLY) local mainSizer = wx.wxBoxSizer(wx.wxVERTICAL) mainSizer:AddWindow(o.label, 1, wx.wxGROW) *************** *** 53,64 **** -- Handle idle events: run the coroutine's next "step" ! o.dialog:Connect (wx.wxEVT_IDLE, function (event) ! if coroutine.status (workCoroutine) ~= "dead" then ! local s, msg = coroutine.resume (workCoroutine) if not msg then o.dialog:Close() else ! o:setStatus (msg) end event:RequestMore() --- 54,65 ---- -- Handle idle events: run the coroutine's next "step" ! o.dialog:Connect(wx.wxEVT_IDLE, function (event) ! if coroutine.status(workCoroutine) ~= "dead" then ! local s, msg = coroutine.resume(workCoroutine) if not msg then o.dialog:Close() else ! o:setStatus(msg) end event:RequestMore() *************** *** 74,79 **** -- Sets the ProgressWindow's "status". For now, this means "change the text" -- being displayed in the window (usually something like "Doing this thing"). ! function ProgressWindow:setStatus (label) ! self.label:AppendText ("\n"..label) end --- 75,80 ---- -- Sets the ProgressWindow's "status". For now, this means "change the text" -- being displayed in the window (usually something like "Doing this thing"). ! function ProgressWindow:setStatus(label) ! self.label:AppendText("\n"..label) end *************** *** 85,89 **** local ID_THE_BUTTON = wx.wxID_HIGHEST + 100 ! frame = wx.wxFrame (wx.wxNull, wx.wxID_ANY, "wxLua Idle Events and Coroutines") --- 86,90 ---- local ID_THE_BUTTON = wx.wxID_HIGHEST + 100 ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua Idle Events and Coroutines") *************** *** 123,144 **** panel = wx.wxPanel(frame, wx.wxID_ANY) ! button = wx.wxButton (panel, ID_THE_BUTTON, "Perform some long operation") ! frame:Connect (ID_THE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local function workFunc() for i = 1, 10 do ! coroutine.yield ("Performing step "..tostring(i).."/10") wx.wxSleep(1) end end ! local workCoroutine = coroutine.create (workFunc) local wndProgress = ! ProgressWindow:new (frame, workCoroutine, ! "Performing some long operation", ! "Performing step 1/many") ! wndProgress.dialog:ShowModal (true) wndProgress.dialog:Destroy() --- 124,145 ---- panel = wx.wxPanel(frame, wx.wxID_ANY) ! button = wx.wxButton(panel, ID_THE_BUTTON, "Perform some long operation") ! frame:Connect(ID_THE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local function workFunc() for i = 1, 10 do ! coroutine.yield("Performing step "..tostring(i).."/10") wx.wxSleep(1) end end ! local workCoroutine = coroutine.create(workFunc) local wndProgress = ! ProgressWindow:new(frame, workCoroutine, ! "Performing some long operation", ! "Performing step 1/many") ! wndProgress.dialog:ShowModal(true) wndProgress.dialog:Destroy() *************** *** 147,149 **** -- Show the main frame ! frame:Show (true) --- 148,150 ---- -- Show the main frame ! frame:Show(true) |
|
From: John L. <jr...@us...> - 2007-04-27 20:27:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23442/wxLua/modules/wxlua/src Modified Files: wxlstate.cpp Log Message: Update docs to 2.8 and some syntax fixes Fix popping too many items from the stack when finding the wxLuaStateRefData from the lua_State Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** wxlstate.cpp 23 Mar 2007 04:27:23 -0000 1.94 --- wxlstate.cpp 27 Apr 2007 20:26:57 -0000 1.95 *************** *** 1131,1137 **** wxLuaStateRefData* d = NULL; ! // try to get the state lua_pushstring( L, "__wxLuaStateRefData" ); ! lua_gettable( L, LUA_REGISTRYINDEX ); // if nothing was returned or it wasn't a ptr, abort --- 1131,1137 ---- wxLuaStateRefData* d = NULL; ! // try to get the state we've stored lua_pushstring( L, "__wxLuaStateRefData" ); ! lua_rawget( L, LUA_REGISTRYINDEX ); // if nothing was returned or it wasn't a ptr, abort *************** *** 1139,1145 **** d = (wxLuaStateRefData*)lua_touserdata( L, -1 ); ! lua_pop(L, 2); - //lua_settop( L, top ); return d; } --- 1139,1144 ---- d = (wxLuaStateRefData*)lua_touserdata( L, -1 ); ! lua_pop(L, 1); // pop the wxLuaStateRefData or nil on failure return d; } |
|
From: John L. <jr...@us...> - 2007-04-27 20:27:03
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23442/wxLua/docs Modified Files: wxlua.html Log Message: Update docs to 2.8 and some syntax fixes Fix popping too many items from the stack when finding the wxLuaStateRefData from the lua_State Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxlua.html 28 Feb 2007 04:28:32 -0000 1.14 --- wxlua.html 27 Apr 2007 20:26:57 -0000 1.15 *************** *** 1,44 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html> ! <head> ! ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> ! <title>wxLua Documentation</title> ! ! ! <meta content="John Labenski" name="author"> ! [...2591 lines suppressed...] ! the script as a string with the given name. The name is only used if lua errors out and then the debug message will contain ! that name. </li> <li>Returns lua's error code LUA_ERRXXX ! or 0 on sucess</li> </ul> <li>int LuaDoBuffer(const ! char *buffer, size_t len, const char ! *name)</li> <ul> <li>Run a buffer, perhaps from ! bin2lua.lua, that you've ! compiled with your program.</li> <li>Returns lua's error ! code LUA_ERRXXX or 0 on sucess</li> </ul> <li>int ! LuaDoFile(const wxString &filename)</li> <ul> <li>Run ! a lua file from disk.</li> <li>Returns lua's error code ! LUA_ERRXXX or 0 on success</li> </ul> <li>int ! LuaCall(int narg, int clear)</li> <ul> <li>Uses ! lua_call to run a chunk on the stack, but sets ! things up for wxLua first.</li> <li>Returns lua's error ! code LUA_ERRXXX or 0 on sucess</li> </ul> <li>The ! other functions are documented in wxlstate.h.</li> ! </ul><br> ! </body></html> \ No newline at end of file |
|
From: John L. <jr...@us...> - 2007-04-25 02:52:28
|
Update of /cvsroot/wxlua/wxLua/modules/lua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9859/wxLua/modules/lua/include Modified Files: lua.h luaconf.h Log Message: Updated lua to 5.1.2 Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/lua.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lua.h 12 Jun 2006 03:50:37 -0000 1.3 --- lua.h 25 Apr 2007 02:52:20 -0000 1.4 *************** *** 18,24 **** #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.1" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" --- 18,24 ---- #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.2" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2007 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" *************** *** 360,364 **** /****************************************************************************** ! * Copyright (C) 1994-2006 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining --- 360,364 ---- /****************************************************************************** ! * Copyright (C) 1994-2007 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/include/luaconf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luaconf.h 12 Jun 2006 03:50:37 -0000 1.2 --- luaconf.h 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 361,365 **** @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @* behavior. ! ** CHANGE it to undefined as soon as you replace to 'luaL_registry' ** your uses of 'luaL_openlib' */ --- 361,365 ---- @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @* behavior. ! ** CHANGE it to undefined as soon as you replace to 'luaL_register' ** your uses of 'luaL_openlib' */ |
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9859/wxLua/modules/lua/src Modified Files: Makefile lbaselib.c lcode.c lfunc.c loadlib.c loslib.c lstrlib.c lua.h luaconf.h lvm.c print.c Log Message: Updated lua to 5.1.2 Index: lbaselib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lbaselib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lbaselib.c 12 Jun 2006 03:50:37 -0000 1.2 --- lbaselib.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 115,123 **** ! static void getfunc (lua_State *L) { if (lua_isfunction(L, 1)) lua_pushvalue(L, 1); else { lua_Debug ar; ! int level = luaL_optint(L, 1, 1); luaL_argcheck(L, level >= 0, 1, "level must be non-negative"); if (lua_getstack(L, level, &ar) == 0) --- 115,123 ---- ! static void getfunc (lua_State *L, int opt) { if (lua_isfunction(L, 1)) lua_pushvalue(L, 1); else { lua_Debug ar; ! int level = opt ? luaL_optint(L, 1, 1) : luaL_checkint(L, 1); luaL_argcheck(L, level >= 0, 1, "level must be non-negative"); if (lua_getstack(L, level, &ar) == 0) *************** *** 132,136 **** static int luaB_getfenv (lua_State *L) { ! getfunc(L); if (lua_iscfunction(L, -1)) /* is a C function? */ lua_pushvalue(L, LUA_GLOBALSINDEX); /* return the thread's global env. */ --- 132,136 ---- static int luaB_getfenv (lua_State *L) { ! getfunc(L, 1); if (lua_iscfunction(L, -1)) /* is a C function? */ lua_pushvalue(L, LUA_GLOBALSINDEX); /* return the thread's global env. */ *************** *** 143,147 **** static int luaB_setfenv (lua_State *L) { luaL_checktype(L, 2, LUA_TTABLE); ! getfunc(L); lua_pushvalue(L, 2); if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) { --- 143,147 ---- static int luaB_setfenv (lua_State *L) { luaL_checktype(L, 2, LUA_TTABLE); ! getfunc(L, 0); lua_pushvalue(L, 2); if (lua_isnumber(L, 1) && lua_tonumber(L, 1) == 0) { Index: lua.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lua.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lua.h 12 Jun 2006 03:50:38 -0000 1.2 --- lua.h 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 18,24 **** #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.1" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2006 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" --- 18,24 ---- #define LUA_VERSION "Lua 5.1" ! #define LUA_RELEASE "Lua 5.1.2" #define LUA_VERSION_NUM 501 ! #define LUA_COPYRIGHT "Copyright (C) 1994-2007 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" *************** *** 360,364 **** /****************************************************************************** ! * Copyright (C) 1994-2006 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining --- 360,364 ---- /****************************************************************************** ! * Copyright (C) 1994-2007 Lua.org, PUC-Rio. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining Index: lstrlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lstrlib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lstrlib.c 12 Jun 2006 03:50:38 -0000 1.2 --- lstrlib.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 724,728 **** static const char *scanformat (lua_State *L, const char *strfrmt, char *form) { const char *p = strfrmt; ! while (strchr(FLAGS, *p)) p++; /* skip flags */ if ((size_t)(p - strfrmt) >= sizeof(FLAGS)) luaL_error(L, "invalid format (repeated flags)"); --- 724,728 ---- static const char *scanformat (lua_State *L, const char *strfrmt, char *form) { const char *p = strfrmt; ! while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++; /* skip flags */ if ((size_t)(p - strfrmt) >= sizeof(FLAGS)) luaL_error(L, "invalid format (repeated flags)"); Index: print.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/print.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** print.c 12 Jun 2006 03:50:38 -0000 1.2 --- print.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 24,29 **** { const char* s=getstr(ts); ! int n=ts->tsv.len; ! int i; putchar('"'); for (i=0; i<n; i++) --- 24,28 ---- { const char* s=getstr(ts); ! size_t i,n=ts->tsv.len; putchar('"'); for (i=0; i<n; i++) *************** *** 33,36 **** --- 32,36 ---- { case '"': printf("\\\""); break; + case '\\': printf("\\\\"); break; case '\a': printf("\\a"); break; case '\b': printf("\\b"); break; Index: loslib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/loslib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loslib.c 12 Jun 2006 03:50:37 -0000 1.2 --- loslib.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 147,155 **** } else { ! char b[256]; ! if (strftime(b, sizeof(b), s, stm)) ! lua_pushstring(L, b); ! else ! return luaL_error(L, LUA_QL("date") " format too long"); } return 1; --- 147,166 ---- } else { ! char cc[3]; ! luaL_Buffer b; ! cc[0] = '%'; cc[2] = '\0'; ! luaL_buffinit(L, &b); ! for (; *s; s++) { ! if (*s != '%' || *(s + 1) == '\0') /* no conversion specifier? */ ! luaL_addchar(&b, *s); ! else { ! size_t reslen; ! char buff[200]; /* should be big enough for any conversion result */ ! cc[1] = *(++s); ! reslen = strftime(buff, sizeof(buff), cc, stm); ! luaL_addlstring(&b, buff, reslen); ! } ! } ! luaL_pushresult(&b); } return 1; Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile 21 Dec 2006 06:02:03 -0000 1.6 --- Makefile 25 Apr 2007 02:52:20 -0000 1.7 *************** *** 21,25 **** # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= ! PLATS= aix ansi bsd generic linux macosx mingw posix solaris LUA_A= ../../../lib/liblua.a --- 21,25 ---- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= ! PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris LUA_A= ../../../lib/liblua.a *************** *** 78,82 **** none: ! @echo "Please choose a platform: $(PLATS)" aix: --- 78,83 ---- none: ! @echo "Please choose a platform:" ! @echo " $(PLATS)" aix: *************** *** 89,92 **** --- 90,96 ---- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E" + freebsd: + $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline" + generic: $(MAKE) all MYCFLAGS= *************** *** 104,107 **** --- 108,112 ---- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \ "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe + $(MAKE) "LUAC_T=luac.exe" luac.exe posix: Index: luaconf.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/luaconf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luaconf.h 12 Jun 2006 03:50:38 -0000 1.2 --- luaconf.h 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 361,365 **** @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @* behavior. ! ** CHANGE it to undefined as soon as you replace to 'luaL_registry' ** your uses of 'luaL_openlib' */ --- 361,365 ---- @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib' @* behavior. ! ** CHANGE it to undefined as soon as you replace to 'luaL_register' ** your uses of 'luaL_openlib' */ Index: lfunc.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lfunc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lfunc.c 29 Mar 2006 05:48:11 -0000 1.2 --- lfunc.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 56,60 **** UpVal *p; UpVal *uv; ! while ((p = ngcotouv(*pp)) != NULL && p->v >= level) { lua_assert(p->v != &p->u.value); if (p->v == level) { /* found a corresponding upvalue? */ --- 56,60 ---- UpVal *p; UpVal *uv; ! while (*pp != NULL && (p = ngcotouv(*pp))->v >= level) { lua_assert(p->v != &p->u.value); if (p->v == level) { /* found a corresponding upvalue? */ *************** *** 97,101 **** UpVal *uv; global_State *g = G(L); ! while ((uv = ngcotouv(L->openupval)) != NULL && uv->v >= level) { GCObject *o = obj2gco(uv); lua_assert(!isblack(o) && uv->v != &uv->u.value); --- 97,101 ---- UpVal *uv; global_State *g = G(L); ! while (L->openupval != NULL && (uv = ngcotouv(L->openupval))->v >= level) { GCObject *o = obj2gco(uv); lua_assert(!isblack(o) && uv->v != &uv->u.value); Index: lcode.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lcode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lcode.c 12 Jun 2006 03:50:37 -0000 1.4 --- lcode.c 25 Apr 2007 02:52:20 -0000 1.5 *************** *** 36,48 **** Instruction *previous; if (fs->pc > fs->lasttarget) { /* no jumps to current position? */ ! if (fs->pc == 0) /* function start? */ ! return; /* positions are already clean */ ! if (GET_OPCODE(*(previous = &fs->f->code[fs->pc-1])) == OP_LOADNIL) { ! int pfrom = GETARG_A(*previous); ! int pto = GETARG_B(*previous); ! if (pfrom <= from && from <= pto+1) { /* can connect both? */ ! if (from+n-1 > pto) ! SETARG_B(*previous, from+n-1); ! return; } } --- 36,53 ---- Instruction *previous; if (fs->pc > fs->lasttarget) { /* no jumps to current position? */ ! if (fs->pc == 0) { /* function start? */ ! if (from >= fs->nactvar) ! return; /* positions are already clean */ ! } ! else { ! previous = &fs->f->code[fs->pc-1]; ! if (GET_OPCODE(*previous) == OP_LOADNIL) { ! int pfrom = GETARG_A(*previous); ! int pto = GETARG_B(*previous); ! if (pfrom <= from && from <= pto+1) { /* can connect both? */ ! if (from+n-1 > pto) ! SETARG_B(*previous, from+n-1); ! return; ! } } } *************** *** 658,665 **** return; else { - int o1 = luaK_exp2RK(fs, e1); int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0; ! freeexp(fs, e2); ! freeexp(fs, e1); e1->u.s.info = luaK_codeABC(fs, op, 0, o1, o2); e1->k = VRELOCABLE; --- 663,676 ---- return; else { int o2 = (op != OP_UNM && op != OP_LEN) ? luaK_exp2RK(fs, e2) : 0; ! int o1 = luaK_exp2RK(fs, e1); ! if (o1 > o2) { ! freeexp(fs, e1); ! freeexp(fs, e2); ! } ! else { ! freeexp(fs, e2); ! freeexp(fs, e1); ! } e1->u.s.info = luaK_codeABC(fs, op, 0, o1, o2); e1->k = VRELOCABLE; *************** *** 719,726 **** break; } ! default: { if (!isnumeral(v)) luaK_exp2RK(fs, v); break; } } } --- 730,742 ---- break; } ! case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV: ! case OPR_MOD: case OPR_POW: { if (!isnumeral(v)) luaK_exp2RK(fs, v); break; } + default: { + luaK_exp2RK(fs, v); + break; + } } } Index: lvm.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lvm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvm.c 12 Jun 2006 03:50:38 -0000 1.3 --- lvm.c 25 Apr 2007 02:52:20 -0000 1.4 *************** *** 166,170 **** if (ttisnil(tm)) tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ ! if (!ttisfunction(tm)) return 0; callTMres(L, res, tm, p1, p2); return 1; --- 166,170 ---- if (ttisnil(tm)) tm = luaT_gettmbyobj(L, p2, event); /* try second operand */ ! if (ttisnil(tm)) return 0; callTMres(L, res, tm, p1, p2); return 1; *************** *** 282,289 **** StkId top = L->base + last + 1; int n = 2; /* number of elements handled in this pass (at least 2) */ ! if (!tostring(L, top-2) || !tostring(L, top-1)) { if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) luaG_concaterror(L, top-2, top-1); ! } else if (tsvalue(top-1)->len > 0) { /* if len=0, do nothing */ /* at least two string values; get as many as possible */ size_t tl = tsvalue(top-1)->len; --- 282,291 ---- StkId top = L->base + last + 1; int n = 2; /* number of elements handled in this pass (at least 2) */ ! if (!(ttisstring(top-2) || ttisnumber(top-2)) || !tostring(L, top-1)) { if (!call_binTM(L, top-2, top-1, top-2, TM_CONCAT)) luaG_concaterror(L, top-2, top-1); ! } else if (tsvalue(top-1)->len == 0) /* second op is empty? */ ! (void)tostring(L, top - 2); /* result is first op (as string) */ ! else { /* at least two string values; get as many as possible */ size_t tl = tsvalue(top-1)->len; Index: loadlib.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/loadlib.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loadlib.c 20 Apr 2006 01:10:58 -0000 1.2 --- loadlib.c 25 Apr 2007 02:52:20 -0000 1.3 *************** *** 17,29 **** #define LUA_LIB - #include "lauxlib.h" - #include "lobject.h" #include "lua.h" - #include "lualib.h" - /* environment variables that hold the search path for packages */ - #define LUA_PATH "LUA_PATH" - #define LUA_CPATH "LUA_CPATH" /* prefix for open functions in C libraries */ --- 17,25 ---- #define LUA_LIB #include "lua.h" + #include "lauxlib.h" + #include "lualib.h" /* prefix for open functions in C libraries */ *************** *** 103,107 **** char *lb; DWORD nsize = sizeof(buff)/sizeof(char); ! DWORD n = GetModuleFileName(NULL, buff, nsize); if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL) luaL_error(L, "unable to get ModuleFileName"); --- 99,103 ---- char *lb; DWORD nsize = sizeof(buff)/sizeof(char); ! DWORD n = GetModuleFileNameA(NULL, buff, nsize); if (n == 0 || n == nsize || (lb = strrchr(buff, '\\')) == NULL) luaL_error(L, "unable to get ModuleFileName"); *************** *** 117,121 **** int error = GetLastError(); char buffer[128]; ! if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buffer, sizeof(buffer), NULL)) lua_pushstring(L, buffer); --- 113,117 ---- int error = GetLastError(); char buffer[128]; ! if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, buffer, sizeof(buffer), NULL)) lua_pushstring(L, buffer); *************** *** 130,134 **** static void *ll_load (lua_State *L, const char *path) { ! HINSTANCE lib = LoadLibrary(path); if (lib == NULL) pusherror(L); return lib; --- 126,130 ---- static void *ll_load (lua_State *L, const char *path) { ! HINSTANCE lib = LoadLibraryA(path); if (lib == NULL) pusherror(L); return lib; *************** *** 361,396 **** if (path == NULL) luaL_error(L, LUA_QL("package.%s") " must be a string", pname); ! lua_pushstring(L, ""); /* error accumulator */ while ((path = pushnexttemplate(L, path)) != NULL) { const char *filename; filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name); if (readable(filename)) /* does file exist and is readable? */ return filename; /* return that file name */ ! lua_pop(L, 2); /* remove path template and file name */ ! luaO_pushfstring(L, "\n\tno file " LUA_QS, filename); ! lua_concat(L, 2); ! } ! ! /* Make 5.0 compatible to allow global LUA_PATH to be set from LUA */ ! if (strcmp(pname, "path") == 0) { ! lua_getfield(L, LUA_GLOBALSINDEX, LUA_PATH); ! path = lua_tostring(L, -1); ! if (path != NULL) { ! lua_pushstring(L, ""); /* error accumulator */ ! while ((path = pushnexttemplate(L, path)) != NULL) { ! const char *filename; ! filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name); ! if (readable(filename)) /* does file exist and is readable? */ ! return filename; /* return that file name */ ! lua_pop(L, 2); /* remove path template and file name */ ! luaO_pushfstring(L, "\n\tno file " LUA_QS, filename); ! lua_concat(L, 2); ! } ! } } - return NULL; /* not found */ } static void loaderror (lua_State *L, const char *filename) { luaL_error(L, "error loading module " LUA_QS " from file " LUA_QS ":\n\t%s", --- 357,375 ---- if (path == NULL) luaL_error(L, LUA_QL("package.%s") " must be a string", pname); ! lua_pushliteral(L, ""); /* error accumulator */ while ((path = pushnexttemplate(L, path)) != NULL) { const char *filename; filename = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name); + lua_remove(L, -2); /* remove path template */ if (readable(filename)) /* does file exist and is readable? */ return filename; /* return that file name */ ! lua_pushfstring(L, "\n\tno file " LUA_QS, filename); ! lua_remove(L, -2); /* remove file name */ ! lua_concat(L, 2); /* add entry to possible error message */ } return NULL; /* not found */ } + static void loaderror (lua_State *L, const char *filename) { luaL_error(L, "error loading module " LUA_QS " from file " LUA_QS ":\n\t%s", *************** *** 446,451 **** if ((stat = ll_loadfunc(L, filename, funcname)) != 0) { if (stat != ERRFUNC) loaderror(L, filename); /* real error */ ! luaO_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, ! name, filename); return 1; /* function not found */ } --- 425,430 ---- if ((stat = ll_loadfunc(L, filename, funcname)) != 0) { if (stat != ERRFUNC) loaderror(L, filename); /* real error */ ! lua_pushfstring(L, "\n\tno module " LUA_QS " in file " LUA_QS, ! name, filename); return 1; /* function not found */ } *************** *** 461,465 **** lua_getfield(L, -1, name); if (lua_isnil(L, -1)) /* not found? */ ! luaO_pushfstring(L, "\n\tno field package.preload['%s']", name); return 1; } --- 440,444 ---- lua_getfield(L, -1, name); if (lua_isnil(L, -1)) /* not found? */ ! lua_pushfstring(L, "\n\tno field package.preload['%s']", name); return 1; } *************** *** 485,489 **** if (!lua_istable(L, -1)) luaL_error(L, LUA_QL("package.loaders") " must be a table"); ! lua_pushstring(L, ""); /* error message accumulator */ for (i=1; ; i++) { lua_rawgeti(L, -2, i); /* get a loader */ --- 464,468 ---- if (!lua_istable(L, -1)) luaL_error(L, LUA_QL("package.loaders") " must be a table"); ! lua_pushliteral(L, ""); /* error message accumulator */ for (i=1; ; i++) { lua_rawgeti(L, -2, i); /* get a loader */ *************** *** 669,674 **** setpath(L, "cpath", LUA_CPATH, LUA_CPATH_DEFAULT); /* set field `cpath' */ /* store config information */ ! lua_pushstring(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" ! LUA_EXECDIR "\n" LUA_IGMARK); lua_setfield(L, -2, "config"); /* set field `loaded' */ --- 648,653 ---- setpath(L, "cpath", LUA_CPATH, LUA_CPATH_DEFAULT); /* set field `cpath' */ /* store config information */ ! lua_pushliteral(L, LUA_DIRSEP "\n" LUA_PATHSEP "\n" LUA_PATH_MARK "\n" ! LUA_EXECDIR "\n" LUA_IGMARK); lua_setfield(L, -2, "config"); /* set field `loaded' */ |
