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: Francesco M. <fr...@us...> - 2007-05-08 18:26:21
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20477/apps/build/msvc6 Added Files: apps_app_luac.dsp Log Message: added project files for new LUAC target --- NEW FILE: apps_app_luac.dsp --- # Microsoft Developer Studio Project File - Name="apps_app_luac" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=app_luac - Win32 Debug Multilib !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "apps_app_luac.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "apps_app_luac.mak" CFG="app_luac - Win32 Debug Multilib" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "app_luac - Win32 Release Unicode Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Release Unicode Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Release Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Release Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Debug Unicode Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Debug Unicode Multilib" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Debug Monolithic" (based on "Win32 (x86) Console Application") !MESSAGE "app_luac - Win32 Debug Multilib" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "app_luac - Win32 Release Unicode Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_luac" # 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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console !ELSEIF "$(CFG)" == "app_luac - Win32 Release Unicode Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswu\app_luac" # 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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console !ELSEIF "$(CFG)" == "app_luac - Win32 Release Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_luac" # 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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console !ELSEIF "$(CFG)" == "app_luac - Win32 Release Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmsw\app_luac" # 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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console !ELSEIF "$(CFG)" == "app_luac - Win32 Debug Unicode Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswud\app_luac" # 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" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug !ELSEIF "$(CFG)" == "app_luac - Win32 Debug Unicode Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswud\app_luac" # 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" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /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" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug !ELSEIF "$(CFG)" == "app_luac - Win32 Debug Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswd\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug !ELSEIF "$(CFG)" == "app_luac - Win32 Debug Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin\vc_lib" # PROP BASE Intermediate_Dir "vcmswd\app_luac" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin\vc_lib" # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Gm /GZ /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug # ADD LINK32 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 lua5.1.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\luac.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:console /debug !ENDIF # Begin Target # Name "app_luac - Win32 Release Unicode Monolithic" # Name "app_luac - Win32 Release Unicode Multilib" # Name "app_luac - Win32 Release Monolithic" # Name "app_luac - Win32 Release Multilib" # Name "app_luac - Win32 Debug Unicode Monolithic" # Name "app_luac - Win32 Debug Unicode Multilib" # Name "app_luac - Win32 Debug Monolithic" # Name "app_luac - Win32 Debug Multilib" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\..\modules\lua\src\luac.c # End Source File # Begin Source File SOURCE=..\..\..\modules\lua\src\print.c # End Source File # End Group # End Target # End Project |
|
From: Francesco M. <fr...@us...> - 2007-05-08 18:26:08
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20101 Modified Files: configure Log Message: fixed missing -l in front of STC lib and OpenGL one Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** configure 6 May 2007 10:02:11 -0000 1.52 --- configure 8 May 2007 18:26:05 -0000 1.53 *************** *** 5793,5797 **** _WX_STC_LIBNAME=$wx_temp ! LIBS="$LIBS $_WX_STC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 --- 5793,5797 ---- _WX_STC_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxSTC contrib is available" >&5 *************** *** 5879,5883 **** _WX_STC_LIBNAME=$wx_temp ! WX_LIBS="$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" --- 5879,5883 ---- _WX_STC_LIBNAME=$wx_temp ! WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" *************** *** 6106,6110 **** _WX_GL_LIBNAME=$wx_temp ! LIBS="$LIBS $_WX_GL_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 --- 6106,6110 ---- _WX_GL_LIBNAME=$wx_temp ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 *************** *** 6191,6195 **** _WX_GL_LIBNAME=$wx_temp ! WX_LIBS="$_WX_GL_LIBNAME $WX_LIBS" fi --- 6191,6195 ---- _WX_GL_LIBNAME=$wx_temp ! WX_LIBS="-l$_WX_GL_LIBNAME $WX_LIBS" fi |
|
From: Francesco M. <fr...@us...> - 2007-05-08 18:26:08
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20101/build/autoconf Modified Files: configure.ac Log Message: fixed missing -l in front of STC lib and OpenGL one Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** configure.ac 6 May 2007 10:02:13 -0000 1.42 --- configure.ac 8 May 2007 18:26:04 -0000 1.43 *************** *** 240,244 **** dnl before WX_LIBS we want the lib of STC WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! LIBS="$LIBS $_WX_STC_LIBNAME $WX_LIBS" dnl check for this component presence --- 240,244 ---- dnl before WX_LIBS we want the lib of STC WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! LIBS="$LIBS -l$_WX_STC_LIBNAME $WX_LIBS" dnl check for this component presence *************** *** 271,275 **** # add to the library to link to the wxSTC lib WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! WX_LIBS="$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" --- 271,275 ---- # add to the library to link to the wxSTC lib WX_LIKE_LIBNAME([_WX_STC_LIBNAME], [wx], [stc]) ! WX_LIBS="-l$_WX_STC_LIBNAME $WX_LIBS" else WXBUILD_STR="$($WX_CONFIG_WITH_ARGS --selected_config)" *************** *** 360,364 **** dnl before WX_LIBS we want the lib of GL WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! LIBS="$LIBS $_WX_GL_LIBNAME $WX_LIBS" dnl check for this component presence --- 360,364 ---- dnl before WX_LIBS we want the lib of GL WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! LIBS="$LIBS -l$_WX_GL_LIBNAME $WX_LIBS" dnl check for this component presence *************** *** 388,392 **** # won't have linking errors WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! WX_LIBS="$_WX_GL_LIBNAME $WX_LIBS" fi --- 388,392 ---- # won't have linking errors WX_LIKE_LIBNAME([_WX_GL_LIBNAME], [wx], [gl]) ! WX_LIBS="-l$_WX_GL_LIBNAME $WX_LIBS" fi |
|
From: John L. <jr...@us...> - 2007-05-08 00:55:16
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8721/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp wxledit.h Log Message: Add accelerators for running, breaking in wxLuaEdit Fix "reset" to work every time in the wxLuaShell Use simplified wxWidgets (>2.6?) macros for declaring the wxLuaEvents Index: wxledit.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxledit.h 15 Dec 2006 19:04:48 -0000 1.17 --- wxledit.h 8 May 2007 00:55:12 -0000 1.18 *************** *** 69,78 **** BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUASHELL_wxLUA_CREATION, 7000) ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUAIDE_wxLUA_CREATION, 7001) END_DECLARE_EVENT_TYPES() ! #define EVT_LUASHELL_wxLUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUASHELL_wxLUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUAIDE_wxLUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUAIDE_wxLUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), //----------------------------------------------------------------------------- --- 69,78 ---- BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUASHELL_wxLUA_CREATION, 7000) ! DECLARE_LOCAL_EVENT_TYPE(wxEVT_LUAIDE_wxLUA_CREATION, 7001) END_DECLARE_EVENT_TYPES() ! #define EVT_LUASHELL_wxLUA_CREATION(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUASHELL_wxLUA_CREATION, id, fn) ! #define EVT_LUAIDE_wxLUA_CREATION(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUAIDE_wxLUA_CREATION, id, fn) //----------------------------------------------------------------------------- *************** *** 120,130 **** // and event.SetInt(1 for static interpreter or 0 for not static), where // static means that the wxLuaShell will not close the wxLuaState on exit. ! // You'll probably want to set the new wxLuaState's eventhandler ! // to this as well as it's win id. // ! // If the event is skipped or not handled the RecreatewxLuaState will call ! // SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1) ! // if the event's wxLuaState is valid. You can not skip the event to not have ! // the wxLuaState recreated at all. virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id); --- 120,130 ---- // and event.SetInt(1 for static interpreter or 0 for not static), where // static means that the wxLuaShell will not close the wxLuaState on exit. ! // You'll probably want to set the new wxLuaState's eventhandler and id ! // to that of this window so this can handle the events. // ! // If the event is skipped or not handled the RecreatewxLuaState function ! // will call SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1) ! // if the event's wxLuaState is valid. You can Skip(false) the event to ! // not have the wxLuaState recreated at all. virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id); *************** *** 254,258 **** // Used to create/recreate local interpreter // Can be subclassed to use your own interpreter derived from a wxLuaState ! // or a new interpreter can be set in by catching the wxEVT_LUASHELL_wxLUA_CREATION // wxLuaEvent that's sent with this control's id and *this as the GetEventObject // the preferred window ID is in event.GetExtraLong() --- 254,258 ---- // Used to create/recreate local interpreter // Can be subclassed to use your own interpreter derived from a wxLuaState ! // or a new interpreter can be set by catching the EVT_LUAIDE_wxLUA_CREATION // wxLuaEvent that's sent with this control's id and *this as the GetEventObject // the preferred window ID is in event.GetExtraLong() Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxledit.cpp 15 Dec 2006 19:04:47 -0000 1.30 --- wxledit.cpp 8 May 2007 00:55:12 -0000 1.31 *************** *** 99,122 **** bool wxLuaShell::RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id) { ! // ask if anyone else wants to create the wxLuaState for us wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState); ! event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); // return if handled, but not skipped. if (GetEventHandler()->ProcessEvent(event)) return false; ! if (event.GetwxLuaState().Ok()) { SetwxLuaState(event.GetwxLuaState(), event.GetInt() == 1); ! return true; } ! wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id); ! wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT ); ! SetwxLuaState(wxlState, false); ! ! return true; } --- 99,128 ---- bool wxLuaShell::RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id) { ! // ask if anyone else wants to create a new wxLuaState for us wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState); ! event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); + // return if handled, but not skipped. if (GetEventHandler()->ProcessEvent(event)) return false; ! // Did they set a valid interpreter for the event and is it new? ! // If it's not different then assume they didn't change it so we'll create ! // a new one below. If they wanted to just adjust the current state they ! // should have called event.Skip(false) ! if (event.GetwxLuaState().Ok() && (event.GetwxLuaState() != m_wxlState)) { SetwxLuaState(event.GetwxLuaState(), event.GetInt() == 1); ! } ! else ! { ! wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id); ! wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT ); ! SetwxLuaState(wxlState, false); } ! return m_wxlState.Ok(); } *************** *** 392,395 **** --- 398,402 ---- m_editorOptions.GetEditorPopupMenu()->Append(wxID_ANY, wxT("wxLua"), wxluaMenu); + // ----------------------------------------------------------------------- // Create the message notebook for shell and output window m_shellOptions.SetSplitterOptions(STS_NO_EDITOR); *************** *** 403,409 **** --- 410,419 ---- m_msgNotebook->CreateOptions(m_shellOptions); + // ----------------------------------------------------------------------- + // Create the interactive lua shell wxSTEditorSplitter *steSplitter = new wxSTEditorSplitter(m_msgNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D); steSplitter->CreateOptions(m_shellOptions); + m_luaShell = new wxLuaShell(steSplitter, ID_WXLUAIDE_SHELL, wxDefaultPosition, wxDefaultSize, 0); *************** *** 415,418 **** --- 425,430 ---- m_msgNotebook->InsertEditorSplitter(-1, steSplitter, true); + // ----------------------------------------------------------------------- + // Create the interactive lua shell for the output of the editor programs steSplitter = new wxSTEditorSplitter(m_msgNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D); *************** *** 426,429 **** --- 438,443 ---- m_luaOutput->SetWrapMode(wxSTC_WRAP_NONE); m_luaOutput->SetFileName(wxT("Output")); + + m_msgNotebook->InsertEditorSplitter(-1, steSplitter, false); *************** *** 471,476 **** void wxLuaIDE::SetMenuBar(wxMenuBar *menuBar) { - m_editorOptions.SetMenuBar(menuBar); m_shellOptions.SetMenuBar(menuBar); if (menuBar && (menuBar->FindMenu(wxT("wxLua")) == wxNOT_FOUND)) { --- 485,491 ---- void wxLuaIDE::SetMenuBar(wxMenuBar *menuBar) { m_shellOptions.SetMenuBar(menuBar); + m_editorOptions.SetMenuBar(menuBar); + if (menuBar && (menuBar->FindMenu(wxT("wxLua")) == wxNOT_FOUND)) { *************** *** 486,491 **** void wxLuaIDE::SetToolBar(wxToolBar *toolBar) { - m_editorOptions.SetToolBar(toolBar); m_shellOptions.SetToolBar(toolBar); m_toolBar = toolBar; --- 501,506 ---- void wxLuaIDE::SetToolBar(wxToolBar *toolBar) { m_shellOptions.SetToolBar(toolBar); + m_editorOptions.SetToolBar(toolBar); m_toolBar = toolBar; *************** *** 509,513 **** if (add_sep) toolBar->AddSeparator(); ! toolBar->AddTool( ID_WXLUAIDE_RUN_LUA, wxT("Run wxLua program"), wxBitmap(play_xpm), wxT("Run the wxLua program") ); toolBar->AddTool( ID_WXLUAIDE_BREAK_LUA, wxT("Stop wxLua program"), wxBitmap(stop_xpm), wxT("Stop the running wxLua program") ); toolBar->AddSeparator(); --- 524,528 ---- if (add_sep) toolBar->AddSeparator(); ! toolBar->AddTool( ID_WXLUAIDE_RUN_LUA, wxT("Run wxLua program"), wxBitmap(play_xpm), wxT("Run the wxLua program in the current editor") ); toolBar->AddTool( ID_WXLUAIDE_BREAK_LUA, wxT("Stop wxLua program"), wxBitmap(stop_xpm), wxT("Stop the running wxLua program") ); toolBar->AddSeparator(); *************** *** 521,530 **** wxSTEditorMenuManager s; wxMenu *wxluaMenu = new wxMenu(); ! wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_RUN_LUA, wxT("&Run wxLua program"), wxT("Run the wxLua program") , wxITEM_NORMAL, wxBitmap(play_xpm))); ! wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_BREAK_LUA, wxT("&Stop wxLua program"), wxT("Stop the running wxLua program") , wxITEM_NORMAL, wxBitmap(stop_xpm))); wxluaMenu->AppendSeparator(); wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm))); wxluaMenu->AppendSeparator(); ! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("&Toggle breakpoint")); return wxluaMenu; } --- 536,545 ---- wxSTEditorMenuManager s; wxMenu *wxluaMenu = new wxMenu(); ! wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_RUN_LUA, wxT("&Run wxLua program\tCtrl+F5"), wxT("Run the wxLua program in the current editor") , wxITEM_NORMAL, wxBitmap(play_xpm))); ! wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_BREAK_LUA, wxT("&Stop wxLua program\tShift+F5"), wxT("Stop the running wxLua program") , wxITEM_NORMAL, wxBitmap(stop_xpm))); wxluaMenu->AppendSeparator(); wxluaMenu->Append(s.MenuItem(wxluaMenu, ID_WXLUAIDE_SHOW_STACK, wxT("Stack &tree"), wxT("Show the lua stack tree") , wxITEM_NORMAL, wxBitmap(LUA_xpm))); wxluaMenu->AppendSeparator(); ! wxluaMenu->Append(ID_WXLUAIDE_TOGGLE_BREAKPOINT, wxT("Toggle &breakpoint")); return wxluaMenu; } *************** *** 550,569 **** bool wxLuaIDE::RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id) { wxLuaEvent event(wxEVT_LUAIDE_wxLUA_CREATION, GetId(), wxNullLuaState); event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); - GetEventHandler()->ProcessEvent( event ); if (event.GetwxLuaState().Ok()) { SetwxLuaState(event.GetwxLuaState(), event.GetInt() == 1); ! return true; } ! wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id); ! wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT ); ! SetwxLuaState(wxlState, false); ! return true; } --- 565,594 ---- bool wxLuaIDE::RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id) { + // ask if anyone else wants to create a new wxLuaState for us wxLuaEvent event(wxEVT_LUAIDE_wxLUA_CREATION, GetId(), wxNullLuaState); event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); + // return if handled, but not skipped. + if (GetEventHandler()->ProcessEvent(event)) + return false; + + // Did they set a valid interpreter for the event and is it new? + // If it's not different then assume they didn't change it so we'll create + // a new one below. If they wanted to just adjust the current state they + // should have called event.Skip(false) if (event.GetwxLuaState().Ok()) { SetwxLuaState(event.GetwxLuaState(), event.GetInt() == 1); ! } ! else ! { ! wxLuaState wxlState = wxLuaState(wxlStateEvtHandler, win_id); ! wxlState.SetLuaDebugHook( 1000, 50, false, LUA_MASKCOUNT ); ! SetwxLuaState(wxlState, false); } ! return m_wxlState.Ok(); } |
|
From: John L. <jr...@us...> - 2007-05-08 00:55:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8721/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: Add accelerators for running, breaking in wxLuaEdit Fix "reset" to work every time in the wxLuaShell Use simplified wxWidgets (>2.6?) macros for declaring the wxLuaEvents Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** wxlstate.h 23 Mar 2007 04:27:23 -0000 1.65 --- wxlstate.h 8 May 2007 00:55:12 -0000 1.66 *************** *** 987,999 **** typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&); ! #define EVT_LUA_CREATION(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_CREATION, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_PRINT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_ERROR, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define EVT_LUA_DEBUG_HOOK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUG_HOOK, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! //#define EVT_LUA_INIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_INIT, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! //#define EVT_LUA_DEBUGGERATTACHED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_LUA_DEBUGGERATTACHED, wxID_ANY, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxLuaEventFunction) & fn, (wxObject *) NULL ), ! #define wxEVT_LUA_CONSOLE wxEVT_LUA_PRINT ! #define EVT_LUA_CONSOLE EVT_LUA_PRINT #endif // _WXLSTATE_H_ --- 987,999 ---- typedef void (wxEvtHandler::*wxLuaEventFunction)(wxLuaEvent&); ! #define wxLuaEventHandler(func) \ ! (wxObjectEventFunction)(wxEventFunction)(wxCommandEventFunction)(wxNotifyEventFunction)wxStaticCastEvent(wxLuaEventFunction, &func) ! #define wx__DECLARE_WXLUAEVT(evt, id, fn) wx__DECLARE_EVT1(evt, id, wxLuaEventHandler(fn)) ! ! #define EVT_LUA_CREATION(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUA_CREATION, id, fn) ! #define EVT_LUA_PRINT(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUA_PRINT, id, fn) ! #define EVT_LUA_ERROR(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUA_ERROR, id, fn) ! #define EVT_LUA_DEBUG_HOOK(id, fn) wx__DECLARE_WXLUAEVT(wxEVT_LUA_DEBUG_HOOK, id, fn) #endif // _WXLSTATE_H_ |
|
From: John L. <jr...@us...> - 2007-05-08 00:55:15
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8721/wxLua/docs Modified Files: changelog.txt Log Message: Add accelerators for running, breaking in wxLuaEdit Fix "reset" to work every time in the wxLuaShell Use simplified wxWidgets (>2.6?) macros for declaring the wxLuaEvents Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** changelog.txt 4 May 2007 19:04:41 -0000 1.27 --- changelog.txt 8 May 2007 00:55:12 -0000 1.28 *************** *** 14,17 **** --- 14,18 ---- - Removed wxLua_AddTrackedObject functions, use wxLuaState::AddTrackedObject. - Updated lua to 5.1.2 + - Removed wxEVT_LUA_CONSOLE compatibility #define, use wxEVT_LUA_PRINT now version 2.8.0.0 (released 24/12/2006) |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:53:22
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps/build/bakefiles Modified Files: apps.bkl Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** apps.bkl 6 May 2007 10:16:31 -0000 1.56 --- apps.bkl 6 May 2007 10:52:45 -0000 1.57 *************** *** 72,76 **** --- 72,78 ---- <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + <!-- lua apps needs only pure lua library: --> <wxlua-lib>lua</wxlua-lib> + <if cond="TARGETING_WIN32=='0'"> <!-- we require the standard MATH library to build the lua sources *************** *** 90,94 **** folder and thus we only need to use .. to get to the module root --> <sources>../modules/lua/src/lua.c</sources> - <headers></headers> <!-- we want as EXE name the standard "lua" name so that when we install --- 92,95 ---- *************** *** 103,114 **** <!-- ================================================================== --> ! <exe id="app_luac" template="luaapp"> ! <!--- the .. is because SRCDIR is always set to us to the wxLua/apps ! folder and thus we only need to use .. to get to the module root --> <sources> ! ../modules/lua/src/luac.c ! ../modules/lua/src/print.c </sources> - <headers></headers> <!-- we want as EXE name the standard "luac" name so that when we install --- 104,119 ---- <!-- ================================================================== --> ! <!-- ! NB: LUAC is built only when SHARED=='0' because LUAC uses ! some private functions contained in the Lua library which ! are not exported as public when building in SHARED mode. ! --> ! ! <exe id="app_luac" template="luaapp" cond="SHARED=='0'"> <sources> ! <!--- the .. is because SRCDIR is always set to us to the wxLua/apps ! folder and thus we only need to use .. to get to the module root --> ! $(addPrefixToList('../modules/lua/src/', 'luac.c print.c')) </sources> <!-- we want as EXE name the standard "luac" name so that when we install |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:53:20
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps Modified Files: Makefile.in Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Makefile.in 6 May 2007 10:16:30 -0000 1.59 --- Makefile.in 6 May 2007 10:52:44 -0000 1.60 *************** *** 95,100 **** --- 95,103 ---- @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) + @COND_SHARED_0@__app_luac___depname = ../bin/luac$(EXEEXT) @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) + @COND_SHARED_0@__install_app_luac___depname = install_app_luac + @COND_SHARED_0@__uninstall_app_luac___depname = uninstall_app_luac @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 186,194 **** ### Targets: ### ! all: ../bin/lua$(EXEEXT) ../bin/luac$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua install_app_luac $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_luac $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install --- 189,197 ---- ### Targets: ### ! all: ../bin/lua$(EXEEXT) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install *************** *** 229,243 **** rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! ../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! ! $(__app_luac___mac_setfilecmd) ! install_app_luac: ! $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_luac: ! rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) --- 232,246 ---- rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! @COND_SHARED_0@ ! @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0@install_app_luac: ! @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_SHARED_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_SHARED_0@uninstall_app_luac: ! @COND_SHARED_0@ rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:52:55
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.vc 6 May 2007 10:16:32 -0000 1.66 --- makefile.vc 6 May 2007 10:52:51 -0000 1.67 *************** *** 116,120 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 116,120 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_40)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 126,130 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 126,130 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 137,141 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 137,141 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_68)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 150,154 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_81)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 150,154 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 177,180 **** --- 177,183 ---- __RUNTIME_LIBS_11 = $(__THREADING) !endif + !if "$(SHARED)" == "0" + __app_luac___depname = ..\..\..\bin\vc_$(____app_27)\luac.exe + !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_25 = D *************** *** 187,194 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" --- 190,197 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_40 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_40 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" *************** *** 196,203 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" --- 199,206 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_54 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_54 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" *************** *** 205,212 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" --- 208,215 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_68 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_68 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" *************** *** 214,221 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_81 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_81 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" --- 217,224 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_82 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_82 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" *************** *** 434,438 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe ..\..\..\bin\vc_$(____app_27)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 437,441 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 479,486 **** --- 482,491 ---- if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) + !if "$(SHARED)" == "0" ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUAC_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 << + !endif make_dir_app_luac: Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.bcc 6 May 2007 10:16:31 -0000 1.66 --- makefile.bcc 6 May 2007 10:52:50 -0000 1.67 *************** *** 211,214 **** --- 211,217 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + !if "$(SHARED)" == "0" + __app_luac___depname = ..\..\..\bin\bcc_$(____app_23)\luac.exe + !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" __app_wxlua___depname = ..\..\..\bin\bcc_$(____app_23)\wxlua.exe *************** *** 432,436 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe ..\..\..\bin\bcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 435,439 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 495,502 **** --- 498,507 ---- if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) + !if "$(SHARED)" == "0" ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_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_LUAC_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_6).lib,, | + !endif make_dir_app_luac: Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.wat 6 May 2007 10:16:32 -0000 1.67 --- makefile.wat 6 May 2007 10:52:51 -0000 1.68 *************** *** 125,128 **** --- 125,132 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + __app_luac___depname = + !ifeq SHARED 0 + __app_luac___depname = ..\..\..\bin\wat_$(____app_23)\luac.exe + !endif __app_wxlua___depname = !ifeq USE_WXBINDSTC 1 *************** *** 567,571 **** ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe ..\..\..\bin\wat_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 571,575 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 609,612 **** --- 613,617 ---- if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + !ifeq SHARED 0 ..\..\..\bin\wat_$(____app_23)\luac.exe : make_dir_app_luac $(APP_LUAC_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc *************** *** 620,623 **** --- 625,629 ---- @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option stack=%i wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + !endif make_dir_app_luac : Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.gcc 6 May 2007 10:16:31 -0000 1.66 --- makefile.gcc 6 May 2007 10:52:51 -0000 1.67 *************** *** 155,158 **** --- 155,161 ---- _BUILDDIR_SHARED_SUFFIX = _dll endif + ifeq ($(SHARED),0) + __app_luac___depname = ..\..\..\bin\gcc_$(____app_23)\luac.exe + endif ifeq ($(USE_WXBINDSTC),1) ifeq ($(USE_WXLUAAPP),1) *************** *** 514,518 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe ..\..\..\bin\gcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 517,521 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 544,549 **** --- 547,554 ---- if not exist ..\..\..\bin\gcc_$(____app_23) mkdir ..\..\..\bin\gcc_$(____app_23) + ifeq ($(SHARED),0) ..\..\..\bin\gcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 + endif make_dir_app_luac: |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:52:54
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps/build/msvc8 Modified Files: apps.sln Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: apps.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps.sln 6 May 2007 10:01:54 -0000 1.3 --- apps.sln 6 May 2007 10:52:47 -0000 1.4 *************** *** 65,96 **** {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {ABCC9B62-46A9-5AAA-A8D1-4CEC3792B04A}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Monolithic|Win32.Build.0 = Debug Unicode Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Unicode Multilib|Win32.Build.0 = Debug Unicode Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 - {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 {50EEE281-856E-5AD8-9E06-E0A15E37B4C5}.Debug Monolithic|Win32.Build.0 = Debug Monolithic|Win32 --- 65,80 ---- |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:52:54
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/build/autoconf Modified Files: autoconf_inc.m4 Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** autoconf_inc.m4 6 May 2007 10:16:32 -0000 1.24 --- autoconf_inc.m4 6 May 2007 10:52:51 -0000 1.25 *************** *** 111,115 **** fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then --- 111,115 ---- fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:16:37
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5022/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added RPATH stuff to test wxLua binaries under Unix without having to install wxLua system-wide Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.vc 6 May 2007 10:01:55 -0000 1.65 --- makefile.vc 6 May 2007 10:16:32 -0000 1.66 *************** *** 472,476 **** ..\..\..\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 << --- 472,476 ---- ..\..\..\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 << *************** *** 480,484 **** ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUAC_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 << --- 480,484 ---- ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUAC_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 << *************** *** 489,493 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << --- 489,493 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << *************** *** 499,503 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << --- 499,503 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << *************** *** 509,513 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << --- 509,513 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << *************** *** 519,523 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << --- 519,523 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.bcc 6 May 2007 10:01:54 -0000 1.65 --- makefile.bcc 6 May 2007 10:16:31 -0000 1.66 *************** *** 488,492 **** ..\..\..\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_6).lib,, | --- 488,492 ---- ..\..\..\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_6).lib,, | *************** *** 496,500 **** ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_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_LUAC_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_6).lib,, | --- 496,500 ---- ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_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_LUAC_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_6).lib,, | *************** *** 505,509 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | --- 505,509 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | *************** *** 515,519 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | --- 515,519 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | *************** *** 525,529 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | --- 525,529 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | *************** *** 535,539 **** !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | --- 535,539 ---- !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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.wat 6 May 2007 10:01:55 -0000 1.66 --- makefile.wat 6 May 2007 10:16:32 -0000 1.67 *************** *** 652,656 **** @%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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 --- 652,656 ---- @%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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.gcc 6 May 2007 10:01:54 -0000 1.65 --- makefile.gcc 6 May 2007 10:16:31 -0000 1.66 *************** *** 539,543 **** ..\..\..\bin\gcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 make_dir_app_lua: --- 539,543 ---- ..\..\..\bin\gcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 make_dir_app_lua: *************** *** 545,549 **** ..\..\..\bin\gcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ! $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 make_dir_app_luac: --- 545,549 ---- ..\..\..\bin\gcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ! $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -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 -llua5.1 make_dir_app_luac: *************** *** 554,558 **** ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__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 endif --- 554,558 ---- ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__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 endif *************** *** 565,569 **** ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__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 endif --- 565,569 ---- ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__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 endif *************** *** 574,578 **** ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -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 --- 574,578 ---- ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -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 *************** *** 582,586 **** ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o ! $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -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 --- 582,586 ---- ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o ! $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -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 |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:16:36
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5022/build/bakefiles Modified Files: wxluabase.bkl Log Message: added RPATH stuff to test wxLua binaries under Unix without having to install wxLua system-wide Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluabase.bkl 4 May 2007 20:36:24 -0000 1.38 --- wxluabase.bkl 6 May 2007 10:16:33 -0000 1.39 *************** *** 210,214 **** <lib-path>$(_LIB_DIRNAME)</lib-path> - <!-- both in case we are using system's lua or our own lua, we need yet another linker path --> --- 210,213 ---- *************** *** 230,233 **** --- 229,249 ---- <include file="mac_bundles.bkl" once="1"/> + <!-- RPATH stuff: --> + + <!-- unlike win compilers, Unix's LD linker supports the -rpath option to insert + in the generated ELF files an hint to the OS about where to search the required + shared libraries. This means the user under Unix will be able to run samples + also before installing the component system-wide: + --> + <define-tag name="rpath-to" rules="exe,module"> + <set var="RPATH"> + <if cond="FORMAT=='gnu' and SHARED=='1'">-Wl,-rpath,$(value)/gcc_dll</if> + <if cond="FORMAT=='autoconf' and SHARED=='1'">-Wl,-rpath,$(value)</if> + </set> + + <!-- for autoconf&gnu only (see comments above): --> + <ldflags>$(RPATH)</ldflags> + </define-tag> + <!-- TAGS COPIED FROM wx.bkl AND ADAPTED TO USE 'SHARED' option |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:16:36
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5022/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 Log Message: added RPATH stuff to test wxLua binaries under Unix without having to install wxLua system-wide Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** autoconf_inc.m4 23 Apr 2007 22:44:28 -0000 1.23 --- autoconf_inc.m4 6 May 2007 10:16:32 -0000 1.24 *************** *** 141,145 **** fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then --- 141,145 ---- fi AC_SUBST(COND_SHARED_0_USE_WXLUASOCKET_1) ! dnl ### begin block 20_COND_SHARED_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1="#" if test "x$SHARED" = "x1" ; then |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:16:35
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5022/apps/build/bakefiles Modified Files: apps.bkl Log Message: added RPATH stuff to test wxLua binaries under Unix without having to install wxLua system-wide Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** apps.bkl 6 May 2007 10:01:53 -0000 1.55 --- apps.bkl 6 May 2007 10:16:31 -0000 1.56 *************** *** 21,24 **** --- 21,25 ---- <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_BINDIR">../../../bin</set> + <set var="WXLUA_LIBDIR">../../../lib</set> <set-srcdir>../..</set-srcdir> *************** *** 31,34 **** --- 32,36 ---- <set var="WXLUA_BASEDIR">$(top_srcdir)</set> <set var="WXLUA_BINDIR">../bin</set> + <set var="WXLUA_LIBDIR">../lib</set> <!-- leave SRCDIR to its '.' default --> *************** *** 53,56 **** --- 55,59 ---- <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> + <rpath-to>$(WXLUA_LIBDIR)</rpath-to> </template> *************** *** 61,64 **** --- 64,69 ---- <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> + <rpath-to>$(WXLUA_LIBDIR)</rpath-to> + <include>$(WXLUA_BASEDIR)/modules/lua/include</include> |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:16:35
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5022/apps Modified Files: Makefile.in Log Message: added RPATH stuff to test wxLua binaries under Unix without having to install wxLua system-wide Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** Makefile.in 6 May 2007 10:01:53 -0000 1.58 --- Makefile.in 6 May 2007 10:16:30 -0000 1.59 *************** *** 182,185 **** --- 182,186 ---- @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle + @COND_SHARED_1@__app = -Wl,-rpath,../lib ### Targets: ### *************** *** 217,221 **** ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) --- 218,222 ---- ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) *************** *** 229,233 **** ../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_luac___mac_setfilecmd) --- 230,234 ---- ../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_luac___mac_setfilecmd) *************** *** 241,245 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 242,246 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 276,280 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 277,281 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 311,315 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 312,316 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 346,350 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 347,351 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(__app) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:02:27
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/bakefiles Modified Files: apps.bkl Log Message: added LUAC target Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** apps.bkl 5 May 2007 16:08:25 -0000 1.54 --- apps.bkl 6 May 2007 10:01:53 -0000 1.55 *************** *** 47,50 **** --- 47,51 ---- <include file="../../../modules/build/bakefiles/options.bkl"/> + <!-- a small template which avoid repeating the same tags for all wxLua apps --> <template id="wxluaapp" template="wxlua"> <app-type>gui</app-type> *************** *** 54,82 **** </template> ! ! ! <!-- ================================================================== --> ! <!-- The LUA interpreter target --> ! <!-- ================================================================== --> ! ! <exe id="app_lua" template="wxlua"> ! <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> ! <app-type>console</app-type> <install-to>$(BINDIR)</install-to> <include>$(WXLUA_BASEDIR)/modules/lua/include</include> - <!--- the .. is because SRCDIR is always set to us to the wxLua/apps - folder and thus we only need to use .. to get to the module root --> - <sources>../modules/lua/src/lua.c</sources> - <headers></headers> - - <!-- we want as EXE name the standard "lua" name so that when we install - wxLua we get the lua installed in standard places and with standard names - (see also the notes in modules.bkl for lua_lib and lua_dll) - --> - <exename>lua</exename> - <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 55,66 ---- </template> ! <!-- a simple template for Lua-only things (not for wxLua apps!) --> ! <template id="luaapp" template="wxlua"> <app-type>console</app-type> <install-to>$(BINDIR)</install-to> + <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 89,106 **** <sys-lib>m</sys-lib> </if> ! </exe> <!-- ================================================================== --> ! <!-- The LUAC compiler target --> <!-- ================================================================== --> ! <exe id="app_luac" template="wxlua"> ! <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> ! <app-type>console</app-type> ! <install-to>$(BINDIR)</install-to> ! <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> --- 73,102 ---- <sys-lib>m</sys-lib> </if> ! </template> ! ! <!-- ================================================================== --> ! <!-- The LUA interpreter target --> <!-- ================================================================== --> ! <exe id="app_lua" template="luaapp"> ! <!--- the .. is because SRCDIR is always set to us to the wxLua/apps ! folder and thus we only need to use .. to get to the module root --> ! <sources>../modules/lua/src/lua.c</sources> ! <headers></headers> ! <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we also get official Lua installed in standard places and with ! standard names (see also the notes in modules.bkl for lua_lib and lua_dll) ! --> ! <exename>lua</exename> ! </exe> ! <!-- ================================================================== --> ! <!-- The LUAC compiler target --> ! <!-- ================================================================== --> + <exe id="app_luac" template="luaapp"> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> *************** *** 111,130 **** <headers></headers> ! <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we get the lua installed in standard places and with standard names ! (see also the notes in modules.bkl for lua_lib and lua_dll) --> <exename>luac</exename> - - <!-- see modules/build/bakefiles/options.bkl for these --> - <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> - <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> - - <wxlua-lib>lua</wxlua-lib> - <if cond="TARGETING_WIN32=='0'"> - <!-- we require the standard MATH library to build the lua sources - (and it needs to be listed _after_ <wxlua-lib>lua</wxlua-lib> --> - <sys-lib>m</sys-lib> - </if> </exe> --- 107,115 ---- <headers></headers> ! <!-- we want as EXE name the standard "luac" name so that when we install ! wxLua we also get official Lua installed in standard places and with ! standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> <exename>luac</exename> </exe> |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:02:27
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps Modified Files: Makefile.in Log Message: added LUAC target Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Makefile.in 23 Apr 2007 22:44:26 -0000 1.57 --- Makefile.in 6 May 2007 10:01:53 -0000 1.58 *************** *** 50,53 **** --- 50,59 ---- APP_LUA_OBJECTS = \ app_lua_lua.o + APP_LUAC_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ + $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) + APP_LUAC_OBJECTS = \ + app_luac_luac.o \ + app_luac_print.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) *************** *** 89,92 **** --- 95,100 ---- @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) + @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ + @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 177,188 **** ### Targets: ### ! all: ../bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 185,197 ---- ### Targets: ### ! all: ../bin/lua$(EXEEXT) ../bin/luac$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua install_app_luac $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_luac $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) + $(STRIP) $(DESTDIR)$(bindir)/luac$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 194,197 **** --- 203,207 ---- rm -f ./*.o rm -f ../bin/lua$(EXEEXT) + rm -f ../bin/luac$(EXEEXT) rm -f ../bin/wxlua$(EXEEXT) rm -rf wxLua.app *************** *** 218,223 **** rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 228,245 ---- rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) + ../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) + $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm + + $(__app_luac___mac_setfilecmd) + + install_app_luac: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) + + uninstall_app_luac: + rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) + @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 254,258 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 276,280 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 289,293 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 311,315 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 324,328 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 346,350 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 361,364 **** --- 383,392 ---- $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c + app_luac_luac.o: $(srcdir)/../modules/lua/src/luac.c + $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/luac.c + + app_luac_print.o: $(srcdir)/../modules/lua/src/print.c + $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c + app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp *************** *** 407,409 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle --- 435,437 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_luac uninstall_app_luac install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:02:16
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31684/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: fixed automatic -g -02 flag addition by autoconf Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** configure.ac 23 Apr 2007 22:44:28 -0000 1.41 --- configure.ac 6 May 2007 10:02:13 -0000 1.42 *************** *** 117,129 **** ##################################################################### AC_CANONICAL_SYSTEM AC_PROG_CC AC_PROG_CXX - # check for wxWidgets - # - # NB: to avoid getting "-g -02" repeated twice in CPPFLAGS, we need - # wxWidgets checks BEFORE lua checks (that's a long story - trust me) - WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) --- 117,129 ---- ##################################################################### + # NB: to avoid getting "-g -02" automatically added to C*FLAGS we need + # to explicitely initialize CFLAGS and CXXFLAGS to empty + CFLAGS= + CXXFLAGS= + AC_CANONICAL_SYSTEM AC_PROG_CC AC_PROG_CXX WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base" AC_SUBST(WXLIBS_REQUIRED) |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:02:16
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31684 Modified Files: configure Log Message: fixed automatic -g -02 flag addition by autoconf Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** configure 23 Apr 2007 22:44:25 -0000 1.51 --- configure 6 May 2007 10:02:11 -0000 1.52 *************** *** 2460,2463 **** --- 2460,2468 ---- ##################################################################### + # NB: to avoid getting "-g -02" automatically added to C*FLAGS we need + # to explicitely initialize CFLAGS and CXXFLAGS to empty + CFLAGS= + CXXFLAGS= + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || *************** *** 3870,3878 **** - # check for wxWidgets - # - # NB: to avoid getting "-g -02" repeated twice in CPPFLAGS, we need - # wxWidgets checks BEFORE lua checks (that's a long story - trust me) - WXLIBS_REQUIRED="xrc,html,adv,net,xml,core,base" --- 3875,3878 ---- |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:01:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added LUAC target Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.vc 4 May 2007 20:22:25 -0000 1.64 --- makefile.vc 6 May 2007 10:01:55 -0000 1.65 *************** *** 107,111 **** APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_25)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 107,120 ---- APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj ! APP_LUAC_CFLAGS = /M$(__RUNTIME_LIBS_25)$(____app_21) /DWIN32 $(____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)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ ! /I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) ! APP_LUAC_OBJECTS = \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 117,121 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_39)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 126,130 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 128,132 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_53)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 137,141 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 141,145 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_67)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ --- 150,154 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_81)$(____app_21) /DWIN32 \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ *************** *** 168,179 **** __RUNTIME_LIBS_11 = $(__THREADING) !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" ! __RUNTIME_LIBS_25 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_25 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" --- 177,194 ---- __RUNTIME_LIBS_11 = $(__THREADING) !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_25 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_25 = $(__THREADING) + !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" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" *************** *** 181,188 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_39 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_39 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" --- 196,203 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUACANAPP)" == "1" *************** *** 190,197 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_53 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_53 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" --- 205,212 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(USE_WXLUAFREEZEAPP)" == "1" *************** *** 199,206 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_67 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_67 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" --- 214,221 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_81 = D !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_81 = $(__THREADING) !endif !if "$(WX_SHARED)" == "0" *************** *** 220,224 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif !if "$(BUILD)" == "debug" --- 235,239 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = /d _UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 226,230 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif !if "$(BUILD)" == "debug" --- 241,245 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(BUILD)" == "debug" *************** *** 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: --- 434,438 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe ..\..\..\bin\vc_$(____app_27)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 428,431 **** --- 443,449 ---- -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)\luac.exe del ..\..\..\bin\vc_$(____app_27)\luac.exe + -if exist ..\..\..\bin\vc_$(____app_27)\luac.ilk del ..\..\..\bin\vc_$(____app_27)\luac.ilk + -if exist ..\..\..\bin\vc_$(____app_27)\luac.pdb del ..\..\..\bin\vc_$(____app_27)\luac.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 *************** *** 461,468 **** 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 << !endif --- 479,494 ---- if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) + ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< + $(APP_LUAC_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 + << + + make_dir_app_luac: + 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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << !endif *************** *** 474,478 **** ..\..\..\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 << !endif --- 500,504 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << !endif *************** *** 484,488 **** ..\..\..\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 << !endif --- 510,514 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << !endif *************** *** 494,498 **** ..\..\..\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 << !endif --- 520,524 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 << !endif *************** *** 504,507 **** --- 530,539 ---- $(CC) /c /nologo /TC /Fo$@ $(APP_LUA_CFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj: ..\..\..\modules\lua\src\luac.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj: ..\..\..\modules\lua\src\print.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 511,515 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 543,547 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 520,524 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 552,556 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 538,542 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 570,574 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 544,547 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** --- 576,579 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** makefile.bcc 4 May 2007 20:22:25 -0000 1.64 --- makefile.bcc 6 May 2007 10:01:54 -0000 1.65 *************** *** 151,162 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 151,170 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj + APP_LUAC_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ + $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ + -I$(LUA_DIR)\include -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAC_OBJECTS = \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj APP_WXLUA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(____WX_SHARED) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 166,170 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ $(CPPFLAGS) $(CXXFLAGS) --- 174,178 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 175,179 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) --- 183,187 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 187,191 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ --- 195,199 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ ! $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ *************** *** 231,235 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif !if "$(BUILD)" == "debug" --- 239,243 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 237,241 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif !if "$(BUILD)" == "debug" --- 245,249 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(BUILD)" == "debug" *************** *** 252,259 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_3 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_3 = !endif !if "$(THREADING)" == "multi" --- 260,267 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_6 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_6 = !endif !if "$(THREADING)" == "multi" *************** *** 264,271 **** !endif !if "$(THREADING)" == "multi" ! __THREADING_3 = -tWM !endif !if "$(THREADING)" == "single" ! __THREADING_3 = !endif !if "$(SHARED)" == "0" --- 272,279 ---- !endif !if "$(THREADING)" == "multi" ! __THREADING_4 = -tWM !endif !if "$(THREADING)" == "single" ! __THREADING_4 = !endif !if "$(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: --- 432,436 ---- ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe ..\..\..\bin\bcc_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 436,439 **** --- 444,453 ---- -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)\luac.exe del ..\..\..\bin\bcc_$(____app_23)\luac.exe + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.tds del ..\..\..\bin\bcc_$(____app_23)\luac.tds + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ilc del ..\..\..\bin\bcc_$(____app_23)\luac.ilc + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ild del ..\..\..\bin\bcc_$(____app_23)\luac.ild + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ilf del ..\..\..\bin\bcc_$(____app_23)\luac.ilf + -if exist ..\..\..\bin\bcc_$(____app_23)\luac.ils del ..\..\..\bin\bcc_$(____app_23)\luac.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 *************** *** 475,479 **** ..\..\..\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,, | --- 489,493 ---- ..\..\..\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_6).lib,, | *************** *** 481,488 **** 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 | !endif --- 495,510 ---- if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) + ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_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_LUAC_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_6).lib,, + | + + make_dir_app_luac: + 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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 494,498 **** ..\..\..\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 | !endif --- 516,520 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 504,508 **** ..\..\..\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 | !endif --- 526,530 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 514,518 **** ..\..\..\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 | !endif --- 536,540 ---- ..\..\..\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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif *************** *** 524,527 **** --- 546,555 ---- $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj: ..\..\..\modules\lua\src\luac.c + $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** + + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj: ..\..\..\modules\lua\src\print.c + $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 531,535 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 559,563 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 540,544 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 568,572 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 558,562 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i..\..\..\modules\wxbind\setup $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 586,590 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i..\..\..\modules\wxbind\setup $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 564,567 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** --- 592,595 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.wat 4 May 2007 20:22:25 -0000 1.65 --- makefile.wat 6 May 2007 10:01:55 -0000 1.66 *************** *** 511,514 **** --- 511,523 ---- APP_LUA_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj + APP_LUAC_CFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & + $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & + -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & + $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & + -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAC_OBJECTS = & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_print.obj APP_WXLUA_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 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 --- 567,571 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe ..\..\..\bin\wat_$(____app_23)\luac.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 567,570 **** --- 576,580 ---- -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)\luac.exe del ..\..\..\bin\wat_$(____app_23)\luac.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 *************** *** 599,602 **** --- 609,627 ---- if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + ..\..\..\bin\wat_$(____app_23)\luac.exe : make_dir_app_luac $(APP_LUAC_OBJECTS) + @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option quiet + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc name $^@ + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option caseexact + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt ref 'main_' + @for %i in ($(APP_LUAC_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc file %i + @for %i in ( 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 lua5.1.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc library %i + @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc option stack=%i + wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc + + make_dir_app_luac : + if not exist ..\..\..\bin\wat_$(____app_23) mkdir ..\..\..\bin\wat_$(____app_23) + !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 *************** *** 609,613 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.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 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_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 634,638 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 629,633 **** @%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 @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 654,658 ---- @%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)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.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 @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i *************** *** 647,651 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( 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) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i --- 672,676 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VER... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:01:58
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/msvc8 Modified Files: apps.sln apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: added LUAC target Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_wxluafreeze.vcproj 4 May 2007 20:22:24 -0000 1.4 --- apps_app_wxluafreeze.vcproj 6 May 2007 10:01:54 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 101,105 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 120,124 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 120,124 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 139,143 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 139,143 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 158,162 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 158,162 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 177,181 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 177,181 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 196,200 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 196,200 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 215,219 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 215,219 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 234,238 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 234,238 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 253,257 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 253,257 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 272,276 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 272,276 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.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="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 291,295 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 291,295 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 310,314 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 310,314 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.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_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxluafreeze.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_wxlua.vcproj 4 May 2007 20:22:24 -0000 1.4 --- apps_app_wxlua.vcproj 6 May 2007 10:01:54 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 44,48 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 44,48 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 63,67 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 63,67 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 82,86 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 82,86 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 101,105 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 101,105 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 120,124 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 120,124 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_dll\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 139,143 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 139,143 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 158,162 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 158,162 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="__WXMSW__;_WINDOWS"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_lib,..\..\..\lib\vc_lib,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="2" Name="VCLinkerTool" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" ProgramDatabaseFile="..\..\..\bin\vc_lib\wxlua.pdb" SubSystem="2" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 177,181 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkI... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:01:58
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/msvc6 Modified Files: apps.dsw apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: added LUAC target Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.dsw 23 Apr 2007 22:57:54 -0000 1.1 --- apps.dsw 6 May 2007 10:01:53 -0000 1.2 *************** *** 15,18 **** --- 15,30 ---- ############################################################################### + Project: "app_luac"=apps_app_luac.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "app_wxlua"=apps_app_wxlua.dsp - Package Owner=<4> Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_wxluaedit.dsp 4 May 2007 20:22:24 -0000 1.4 --- apps_app_wxluaedit.dsp 6 May 2007 10:01:54 -0000 1.5 *************** *** 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" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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" *************** *** 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" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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" *************** *** 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" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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" *************** *** 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" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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" *************** *** 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" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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" *************** *** 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" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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" *************** *** 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" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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" *************** *** 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" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.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" *************** *** 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" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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" *************** *** 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" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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" *************** *** 316,321 **** # 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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" *************** *** 341,346 **** # 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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.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_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Monolithic" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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 DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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 DLL Multilib" *************** *** 391,396 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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 Monolithic" --- 391,396 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /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 Monolithic" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" --- 416,421 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" *************** *** 441,446 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxlua.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF --- 441,446 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /libpath:"$(WXSTEDIT)\lib\vc_lib" !ENDIF Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_wxluacan.dsp 4 May 2007 20:22:24 -0000 1.4 --- apps_app_wxluacan.dsp 6 May 2007 10:01:54 -0000 1.5 *************** *** 66,71 **** # 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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # 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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" *************** *** 91,96 **** # 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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # 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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Monolithic" *************** *** 116,121 **** # 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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows ! # 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 olea... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-05-05 16:08:39
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4080/bakefiles Modified Files: apps.bkl Log Message: Add luac the lua compiler as an app to build Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** apps.bkl 4 May 2007 20:22:23 -0000 1.53 --- apps.bkl 5 May 2007 16:08:25 -0000 1.54 *************** *** 92,95 **** --- 92,133 ---- <!-- ================================================================== --> + <!-- The LUAC compiler target --> + <!-- ================================================================== --> + + <exe id="app_luac" template="wxlua"> + <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> + + <app-type>console</app-type> + <install-to>$(BINDIR)</install-to> + + <include>$(WXLUA_BASEDIR)/modules/lua/include</include> + + <!--- the .. is because SRCDIR is always set to us to the wxLua/apps + folder and thus we only need to use .. to get to the module root --> + <sources> + ../modules/lua/src/luac.c + ../modules/lua/src/print.c + </sources> + <headers></headers> + + <!-- we want as EXE name the standard "lua" name so that when we install + wxLua we get the lua installed in standard places and with standard names + (see also the notes in modules.bkl for lua_lib and lua_dll) + --> + <exename>luac</exename> + + <!-- see modules/build/bakefiles/options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + + <wxlua-lib>lua</wxlua-lib> + <if cond="TARGETING_WIN32=='0'"> + <!-- we require the standard MATH library to build the lua sources + (and it needs to be listed _after_ <wxlua-lib>lua</wxlua-lib> --> + <sys-lib>m</sys-lib> + </if> + </exe> + + <!-- ================================================================== --> <!-- The WXLUA application target --> <!-- ================================================================== --> |
|
From: John L. <jr...@us...> - 2007-05-04 20:36:31
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14401/build/bakefiles Modified Files: wxluabase.bkl Log Message: Changed link order to lua, wxlua, wxbind, wxbindstc, wxluadebug, wxluasocket Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluabase.bkl 23 Apr 2007 22:44:29 -0000 1.37 --- wxluabase.bkl 4 May 2007 20:36:24 -0000 1.38 *************** *** 124,132 **** <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers --> <define-tag name="wxlua-alllibs" rules="exe,dll,module"> - <wxlua-lib>wxlua</wxlua-lib> - <wxlua-lib>wxbindstc</wxlua-lib> - <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </define-tag> --- 124,132 ---- <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers --> <define-tag name="wxlua-alllibs" rules="exe,dll,module"> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxbindstc</wxlua-lib> + <wxlua-lib>wxbind</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </define-tag> *************** *** 134,142 **** <!-- shortcut for including *all* wxLua libraries, except CONTRIB wrappers --> <define-tag name="wxlua-allstdlibs" rules="exe,dll,module"> - <wxlua-lib>wxlua</wxlua-lib> - <!-- <wxlua-lib>wxbindstc</wxlua-lib> --> - <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </define-tag> --- 134,142 ---- <!-- shortcut for including *all* wxLua libraries, except CONTRIB wrappers --> <define-tag name="wxlua-allstdlibs" rules="exe,dll,module"> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <!-- <wxlua-lib>wxbindstc</wxlua-lib> --> + <wxlua-lib>wxbind</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </define-tag> |
