X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e662c3157e7e2150c14825f6a828eef585d00cf1..8c0f0784084798f225cec198f530461e03014cd3:/build/msw/wx_vc8_html.vcproj diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index f042da8ce6..107a382ff8 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -1,8 +1,8 @@ -<?xml version="1.0" ?> +<?xml version="1.0" encoding="Windows-1252"?> <!-- - This makefile was generated by - Bakefile 0.2.3 (http://www.bakefile.org) + This project was generated by + Bakefile 0.2.8 (http://www.bakefile.org) Do not modify, all changes will be overwritten! --> @@ -22,10 +22,10 @@ </ToolFiles> <Configurations> <Configuration - Name="DLL Universal Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivudll\html" - ConfigurationType="2" + Name="Debug|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswud\html" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -43,66 +43,60 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="false" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING" + MinimalRebuild="true" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="2" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch" - AssemblerListingLocation="vc_mswunivudll\html\" - ObjectFile="vc_mswunivudll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch" + ObjectFile="vc_mswud\html\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - AdditionalOptions="" - OutputFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib" + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -113,10 +107,10 @@ /> </Configuration> <Configuration - Name="DLL Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswunivuddll\html" - ConfigurationType="2" + Name="Release|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswu\html" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -134,66 +128,57 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="true" + Optimization="2" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="3" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" - BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch" - AssemblerListingLocation="vc_mswunivuddll\html\" - ObjectFile="vc_mswunivuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch" + ObjectFile="vc_mswu\html\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - AdditionalOptions="" - OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -204,10 +189,10 @@ /> </Configuration> <Configuration - Name="DLL Release|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswudll\html" - ConfigurationType="2" + Name="Universal Debug|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswunivud\html" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -225,66 +210,60 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="false" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + MinimalRebuild="true" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="2" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch" - AssemblerListingLocation="vc_mswudll\html\" - ObjectFile="vc_mswudll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch" + ObjectFile="vc_mswunivud\html\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" - AdditionalOptions="" - OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -295,10 +274,10 @@ /> </Configuration> <Configuration - Name="DLL Debug|Win32" - OutputDirectory="..\..\lib\vc_dll" - IntermediateDirectory="vc_mswuddll\html" - ConfigurationType="2" + Name="Universal Release|Win32" + OutputDirectory="..\..\lib\vc_lib" + IntermediateDirectory="vc_mswunivu\html" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -316,66 +295,57 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="true" + Optimization="2" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="3" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" - BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" - AssemblerListingLocation="vc_mswuddll\html\" - ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb" + PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch" + ObjectFile="vc_mswunivu\html\" + ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLinkerTool" - AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" - AdditionalOptions="" - OutputFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll" - LinkIncremental="2" - ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib" + Name="VCLibrarianTool" + OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\lib\vc_dll" - GenerateManifest="true" - GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb" - TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -386,10 +356,10 @@ /> </Configuration> <Configuration - Name="Universal Release|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivu\html" - ConfigurationType="4" + Name="DLL Debug|Win32" + OutputDirectory="..\..\lib\vc_dll" + IntermediateDirectory="vc_mswuddll\html" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -407,57 +377,69 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="false" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + MinimalRebuild="true" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="2" - PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch" - AssemblerListingLocation="vc_mswunivu\html\" - ObjectFile="vc_mswunivu\html\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb" + PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" + ObjectFile="vc_mswuddll\html\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib" + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateManifest="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_html_vc_custom.pdb" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -468,10 +450,10 @@ /> </Configuration> <Configuration - Name="Universal Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswunivud\html" - ConfigurationType="4" + Name="DLL Release|Win32" + OutputDirectory="..\..\lib\vc_dll" + IntermediateDirectory="vc_mswudll\html" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -489,57 +471,68 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="true" + Optimization="2" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="3" - PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" - BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch" - AssemblerListingLocation="vc_mswunivud\html\" - ObjectFile="vc_mswunivud\html\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb" + PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch" + ObjectFile="vc_mswudll\html\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib" + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.dll" + LinkIncremental="1" + ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateManifest="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_html_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -550,10 +543,10 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswu\html" - ConfigurationType="4" + Name="DLL Universal Debug|Win32" + OutputDirectory="..\..\lib\vc_dll" + IntermediateDirectory="vc_mswunivuddll\html" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -571,57 +564,69 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="false" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + MinimalRebuild="true" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="2" - PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING" BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="3" + BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch" - AssemblerListingLocation="vc_mswu\html\" - ObjectFile="vc_mswu\html\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb" + PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch" + ObjectFile="vc_mswunivuddll\html\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib" + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.dll" + LinkIncremental="2" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateManifest="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_html_vc_custom.pdb" + TargetMachine="1" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -632,10 +637,10 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\lib\vc_lib" - IntermediateDirectory="vc_mswud\html" - ConfigurationType="4" + Name="DLL Universal Release|Win32" + OutputDirectory="..\..\lib\vc_dll" + IntermediateDirectory="vc_mswunivudll\html" + ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -653,57 +658,68 @@ Name="VCWebServiceProxyGeneratorTool" /> <Tool - Name="VCIDLTool" + Name="VCMIDLTool" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCCLCompilerTool" - Optimization="0" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - MinimalRebuild="true" + Optimization="2" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" + PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" ExceptionHandling="1" - AdditionalOptions="" - RuntimeLibrary="3" - PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" - BasicRuntimeChecks="3" - DebugInformationFormat="3" - Detect64BitPortabilityProblems="true" + RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="wx/wxprec.h" - PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch" - AssemblerListingLocation="vc_mswud\html\" - ObjectFile="vc_mswud\html\" - ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb" + PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch" + ObjectFile="vc_mswunivudll\html\" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" Culture="1033" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" /> <Tool Name="VCPreLinkEventTool" /> <Tool - Name="VCLibrarianTool" - OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib" + Name="VCLinkerTool" + AdditionalOptions="" + AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib" + OutputFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.dll" + LinkIncremental="1" + ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\lib\vc_dll" + GenerateManifest="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_html_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" /> + <Tool + Name="VCManifestTool" + /> <Tool Name="VCXDCMakeTool" /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc8_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc8_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -726,7 +742,7 @@ RelativePath="..\..\src\common\dummy.cpp" > <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -734,7 +750,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -742,7 +758,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32" + Name="Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -750,7 +766,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32" + Name="Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -758,7 +774,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -766,7 +782,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -774,7 +790,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="DLL Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -782,7 +798,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -797,24 +813,25 @@ > <File RelativePath="..\..\src\msw\helpbest.cpp" - /> + > + </File> <File RelativePath="..\..\src\msw\version.rc" > <FileConfiguration - Name="Universal Release|Win32" + Name="Debug|Win32" ExcludedFromBuild="true" /> <FileConfiguration - Name="Universal Debug|Win32" + Name="Release|Win32" ExcludedFromBuild="true" /> <FileConfiguration - Name="Release|Win32" + Name="Universal Debug|Win32" ExcludedFromBuild="true" /> <FileConfiguration - Name="Debug|Win32" + Name="Universal Release|Win32" ExcludedFromBuild="true" /> </File> @@ -825,7 +842,8 @@ > <File RelativePath="..\..\src\generic\htmllbox.cpp" - /> + > + </File> </Filter> <Filter Name="wxHTML Sources" @@ -833,70 +851,92 @@ > <File RelativePath="..\..\src\html\helpctrl.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\helpdata.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\helpdlg.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\helpfrm.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\helpwnd.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmlcell.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmlfilt.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmlpars.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmltag.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmlwin.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\htmprint.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_dflist.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_fonts.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_hline.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_image.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_layout.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_links.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_list.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_pre.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_style.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\m_tables.cpp" - /> + > + </File> <File RelativePath="..\..\src\html\winpars.cpp" - /> + > + </File> </Filter> <Filter Name="Setup Headers" @@ -906,121 +946,121 @@ RelativePath="..\..\include\wx\msw\setup.h" > <FileConfiguration - Name="DLL Universal Release|Win32" - /> - <FileConfiguration - Name="DLL Universal Debug|Win32" - /> - <FileConfiguration - Name="DLL Release|Win32" + Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswu\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h" + Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32" + Name="Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswud\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h" + Outputs="..\..\lib\vc_lib\mswu\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32" + Name="Universal Debug|Win32" /> <FileConfiguration - Name="Universal Debug|Win32" + Name="Universal Release|Win32" /> <FileConfiguration - Name="Release|Win32" + Name="DLL Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswu\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h" + Outputs="..\..\lib\vc_dll\mswud\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswud\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h" + Outputs="..\..\lib\vc_dll\mswu\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> + <FileConfiguration + Name="DLL Universal Debug|Win32" + /> + <FileConfiguration + Name="DLL Universal Release|Win32" + /> </File> <File RelativePath="..\..\include\wx\univ\setup.h" > <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Debug|Win32" + /> + <FileConfiguration + Name="Release|Win32" + /> + <FileConfiguration + Name="Universal Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h" + Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Universal Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h" - Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h" + Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32" + Name="DLL Debug|Win32" /> <FileConfiguration - Name="DLL Debug|Win32" + Name="DLL Release|Win32" /> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Universal Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h" + Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Universal Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h" - CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h" - Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h" - AdditionalDependencies="$(SOURCE) "$(INTDIR)" "$(OUTDIR)"" + Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h" + CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h" + Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h" + AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)"" /> </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - /> - <FileConfiguration - Name="Debug|Win32" - /> </File> </Filter> <Filter @@ -1031,97 +1071,98 @@ RelativePath="..\..\include\wx\msw\genrcdefs.h" > <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"" + Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"" + Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32" + Name="Universal Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"" + Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32" + Name="Universal Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"" + Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"" + Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"" + Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="DLL Universal Debug|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"" + Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw"" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL Universal Release|Win32" > <Tool Name="VCCustomBuildTool" - Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"" - Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" - AdditionalDependencies=""$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"" + Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" + CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"" + Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" + AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw"" /> </FileConfiguration> </File> <File RelativePath="..\..\include\wx\msw\helpbest.h" - /> + > + </File> </Filter> <Filter Name="wxHTML Headers" @@ -1129,49 +1170,64 @@ > <File RelativePath="..\..\include\wx\html\helpctrl.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\helpdata.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\helpdlg.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\helpfrm.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\helpwnd.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmlcell.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmldefs.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmlfilt.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmlpars.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmlproc.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmltag.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmlwin.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\htmprint.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\m_templ.h" - /> + > + </File> <File RelativePath="..\..\include\wx\html\winpars.h" - /> + > + </File> </Filter> <Filter Name="Common Headers" @@ -1179,10 +1235,12 @@ > <File RelativePath="..\..\include\wx\htmllbox.h" - /> + > + </File> <File RelativePath="..\..\include\wx\wxhtml.h" - /> + > + </File> </Filter> </Files> <Globals>