From: John L. <jr...@us...> - 2007-07-04 05:39:57
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/msvc8 Modified Files: modules.sln modules_mod_luamodule.vcproj modules_mod_wxbind.vcproj modules_mod_wxbindstc.vcproj modules_mod_wxlua.vcproj modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Added Files: modules_mod_wxbindaui.vcproj Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: modules.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modules.sln 24 Apr 2007 14:39:58 -0000 1.2 --- modules.sln 4 Jul 2007 05:39:17 -0000 1.3 *************** *** 9,12 **** --- 9,14 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxbindstc", "modules_mod_wxbindstc.vcproj", "{B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}" EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxbindaui", "modules_mod_wxbindaui.vcproj", "{4E407FCD-BE1C-5FA7-A1E1-C020135508F4}" + EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluadebug", "modules_mod_wxluadebug.vcproj", "{3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}" EndProject *************** *** 163,166 **** --- 165,200 ---- {B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Monolithic|Win32.Build.0 = Debug Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Multilib|Win32.Build.0 = Debug Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Monolithic|Win32.Build.0 = Debug Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 {3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 {3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 Index: modules_mod_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxlua.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxlua.vcproj 14 Jun 2007 12:23:04 -0000 1.4 --- modules_mod_wxlua.vcproj 4 Jul 2007 05:39:17 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 161,165 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 161,165 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 178,182 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 178,182 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 229,233 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 229,233 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 246,250 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 246,250 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: modules_mod_wxluasocket.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluasocket.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxluasocket.vcproj 24 May 2007 00:59:44 -0000 1.4 --- modules_mod_wxluasocket.vcproj 4 Jul 2007 05:39:17 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 161,165 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 161,165 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 178,182 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 178,182 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 229,233 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 229,233 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 246,250 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 246,250 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.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" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_luamodule.vcproj 4 May 2007 20:22:26 -0000 1.3 --- modules_mod_luamodule.vcproj 4 Jul 2007 05:39:17 -0000 1.4 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.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="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 59,63 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 59,63 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.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="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 76,80 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 76,80 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.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="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;... [truncated message content] |