X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b44f5137ce562c2c281542b09f2ed6379dcbf00b..b54a0e3913d919ed1ed2b51acb0ebbe5e4c0bb11:/build/msw/wx_vc9_html.vcproj diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index 6e785c0faf..9842902dbf 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="Windows-1252"?> <!-- - This makefile was generated by - Bakefile 0.2.5 (http://www.bakefile.org) + This project was generated by + Bakefile 0.2.9 (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,23 +43,26 @@ 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" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + 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" DebugInformationFormat="3" @@ -69,26 +72,17 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" + 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" - 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\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" @@ -101,7 +95,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -112,10 +106,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" @@ -133,25 +127,24 @@ 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" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="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" DebugInformationFormat="3" @@ -161,26 +154,17 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" + 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" - 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\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" @@ -193,7 +177,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -204,10 +188,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,23 +209,26 @@ 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" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + 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" DebugInformationFormat="3" @@ -251,26 +238,17 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" + 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" - 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\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" @@ -283,7 +261,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -294,10 +272,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" @@ -315,25 +293,24 @@ 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" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="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" DebugInformationFormat="3" @@ -343,26 +320,17 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML" + 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" + 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" - 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\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" @@ -375,7 +343,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -386,10 +354,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,23 +375,26 @@ 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" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + 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" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + 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\wxmsw293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -433,17 +404,26 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_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" + 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\wxmsw293ud_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\wxmsw293ud_html_vc_custom.pdb" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -456,7 +436,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -467,10 +447,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" @@ -488,25 +468,24 @@ 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" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + 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" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="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\wxmsw293u_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -516,17 +495,28 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_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" + 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\wxmsw293u_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\wxmsw293u_html_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -539,7 +529,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -550,10 +540,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,23 +561,26 @@ 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" AdditionalOptions="/MP" - Optimization="2" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING" + 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" ExceptionHandling="1" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + 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\wxmswuniv293ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -597,17 +590,26 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_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" + 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\wxmswuniv293ud_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\wxmswuniv293ud_html_vc_custom.pdb" + TargetMachine="1" /> <Tool Name="VCALinkTool" @@ -620,7 +622,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -631,10 +633,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" @@ -652,25 +654,24 @@ 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" AdditionalOptions="/MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib" - PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + 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" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="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\wxmswuniv293u_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -680,17 +681,28 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING" + PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_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" + 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\wxmswuniv293u_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\wxmswuniv293u_html_vc_custom.pdb" + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> <Tool Name="VCALinkTool" @@ -703,7 +715,7 @@ /> <Tool Name="VCBscMakeTool" - OutputFile="..\..\lib\vc_lib\wx_vc9_html.bsc" + OutputFile="..\..\lib\vc_dll\wx_vc9_html.bsc" SuppressStartupBanner="true" /> <Tool @@ -726,7 +738,7 @@ RelativePath="..\..\src\common\dummy.cpp" > <FileConfiguration - Name="DLL Universal Release|Win32" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -734,7 +746,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Universal Debug|Win32" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -742,7 +754,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Release|Win32" + Name="Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -750,7 +762,7 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL Debug|Win32" + Name="Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -758,7 +770,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Release|Win32" + Name="DLL Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -766,7 +778,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Universal Debug|Win32" + Name="DLL Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -774,7 +786,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="DLL Universal Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -782,7 +794,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL Universal Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -803,19 +815,19 @@ 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> @@ -909,6 +921,10 @@ RelativePath="..\..\src\html\m_pre.cpp" > </File> + <File + RelativePath="..\..\src\html\m_span.cpp" + > + </File> <File RelativePath="..\..\src\html\m_style.cpp" > @@ -917,6 +933,10 @@ RelativePath="..\..\src\html\m_tables.cpp" > </File> + <File + RelativePath="..\..\src\html\styleparams.cpp" + > + </File> <File RelativePath="..\..\src\html\winpars.cpp" > @@ -930,121 +950,113 @@ 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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </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=""$(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" /> </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - /> - <FileConfiguration - Name="Debug|Win32" - /> </File> </Filter> <Filter @@ -1055,91 +1067,91 @@ 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=""..\..\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=""..\..\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=""..\..\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=""..\..\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=""..\..\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=""..\..\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=""..\..\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=""..\..\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> @@ -1208,6 +1220,10 @@ RelativePath="..\..\include\wx\html\m_templ.h" > </File> + <File + RelativePath="..\..\include\wx\html\styleparams.h" + > + </File> <File RelativePath="..\..\include\wx\html\winpars.h" >