-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
<!--\r
\r
- This makefile was generated by\r
- Bakefile 0.2.3 (http://www.bakefile.org)\r
+ This project was generated by\r
+ Bakefile 0.2.9 (http://www.bakefile.org)\r
Do not modify, all changes will be overwritten!\r
\r
-->\r
</Platforms>\r
<Configurations>\r
<Configuration\r
- Name="DLL Universal Release|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswunivudll\html"\r
- ConfigurationType="2"\r
+ Name="Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswud\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
- Name="VCPreBuildEventTool"/>\r
+ Name="VCCLCompilerTool"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+ MinimalRebuild="TRUE"\r
+ ExceptionHandling="TRUE"\r
+ BasicRuntimeChecks="3"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
+ RuntimeTypeInfo="TRUE"\r
+ UsePrecompiledHeader="3"\r
+ PrecompiledHeaderThrough="wx/wxprec.h"\r
+ PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswud\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"\r
+ WarningLevel="4"\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"\r
+ SuppressStartupBanner="TRUE"/>\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreLinkEventTool"/>\r
+ <Tool\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCIDLTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
+ <Tool\r
+ Name="VCWebDeploymentTool"/>\r
+ <Tool\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
+ <Tool\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+ </Configuration>\r
+ <Configuration\r
+ Name="Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswu\html"\r
+ ConfigurationType="4"\r
+ UseOfMFC="0"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+ CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="false"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+ ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswunivudll\html\"\r
- ObjectFile="vc_mswunivudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswu\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
+ <Tool\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"\r
+ SuppressStartupBanner="TRUE"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
- Name="VCLinkerTool"\r
- 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"\r
- AdditionalOptions=""\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
- SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_html_vc_custom.pdb"\r
- TargetMachine="1"/>\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Universal Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswunivuddll\html"\r
- ConfigurationType="2"\r
+ Name="Universal Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswunivud\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ MinimalRebuild="TRUE"\r
+ ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswunivuddll\html\"\r
- ObjectFile="vc_mswunivuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswunivud\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"\r
+ SuppressStartupBanner="TRUE"/>\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
- Name="VCLinkerTool"\r
- 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"\r
- AdditionalOptions=""\r
- OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
- SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_html_vc_custom.pdb"\r
- TargetMachine="1"/>\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="DLL Release|Win32"\r
- OutputDirectory="..\..\lib\vc_dll"\r
- IntermediateDirectory="vc_mswudll\html"\r
- ConfigurationType="2"\r
+ Name="Universal Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_lib"\r
+ IntermediateDirectory="vc_mswunivu\html"\r
+ ConfigurationType="4"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="false"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+ ExceptionHandling="TRUE"\r
RuntimeLibrary="2"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswudll\html\"\r
- ObjectFile="vc_mswudll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"\r
+ ObjectFile="vc_mswunivu\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>\r
+ Name="VCLibrarianTool"\r
+ OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"\r
+ SuppressStartupBanner="TRUE"/>\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
- Name="VCLinkerTool"\r
- 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"\r
- AdditionalOptions=""\r
- OutputFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.dll"\r
- LinkIncremental="2"\r
- ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
- SuppressStartupBanner="true"\r
- AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_html_vc_custom.pdb"\r
- TargetMachine="1"/>\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
Name="DLL Debug|Win32"\r
IntermediateDirectory="vc_mswuddll\html"\r
ConfigurationType="2"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- InlineFunctionExpansion="1"\r
AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ MinimalRebuild="TRUE"\r
+ ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch"\r
- AssemblerListingLocation="vc_mswuddll\html\"\r
ObjectFile="vc_mswuddll\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
- <Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCLinkerTool"\r
- 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"\r
AdditionalOptions=""\r
- OutputFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.dll"\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.dll"\r
LinkIncremental="2"\r
ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_html.lib"\r
- SuppressStartupBanner="true"\r
+ SuppressStartupBanner="TRUE"\r
AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
- GenerateDebugInformation="true"\r
- ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_html_vc_custom.pdb"\r
+ GenerateDebugInformation="TRUE"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_html_vc_custom.pdb"\r
TargetMachine="1"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
- <Tool\r
- Name="VCXDCMakeTool"/>\r
- <Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_dll\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
- <Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
Name="VCPostBuildEventTool"/>\r
- </Configuration>\r
- <Configuration\r
- Name="Universal Release|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswunivu\html"\r
- ConfigurationType="4"\r
- UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
- CharacterSet="1">\r
<Tool\r
Name="VCPreBuildEventTool"/>\r
<Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="false"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivu\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswunivu\html\"\r
- ObjectFile="vc_mswunivu\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_html.pdb"\r
- WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
- <Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmswuniv29u_html.lib"\r
- SuppressStartupBanner="true"/>\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Universal Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswunivud\html"\r
- ConfigurationType="4"\r
+ Name="DLL Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswudll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
<Tool\r
- Name="VCPreBuildEventTool"/>\r
+ Name="VCCLCompilerTool"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ ExceptionHandling="TRUE"\r
+ RuntimeLibrary="2"\r
+ RuntimeTypeInfo="TRUE"\r
+ UsePrecompiledHeader="3"\r
+ PrecompiledHeaderThrough="wx/wxprec.h"\r
+ PrecompiledHeaderFile="vc_mswudll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswudll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_html_vc_custom.pdb"\r
+ WarningLevel="4"\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions=""\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmsw295u_html_vc_custom.dll"\r
+ LinkIncremental="1"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmsw29u_html.lib"\r
+ SuppressStartupBanner="TRUE"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateDebugInformation="TRUE"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
<Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCIDLTool"/>\r
+ Name="VCPostBuildEventTool"/>\r
<Tool\r
- Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswunivud\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswunivud\html\"\r
- ObjectFile="vc_mswunivud\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_html.pdb"\r
- WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_html.lib"\r
- SuppressStartupBanner="true"/>\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Release|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswu\html"\r
- ConfigurationType="4"\r
+ Name="DLL Universal Debug|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswunivuddll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
CharacterSet="1">\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="2"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="false"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="2"\r
- PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+ Optimization="0"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ MinimalRebuild="TRUE"\r
+ ExceptionHandling="TRUE"\r
BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ RuntimeLibrary="3"\r
+ BufferSecurityCheck="TRUE"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswu\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswu\html\"\r
- ObjectFile="vc_mswu\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivuddll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswunivuddll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"/>\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions=""\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.dll"\r
+ LinkIncremental="2"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_html.lib"\r
+ SuppressStartupBanner="TRUE"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateDebugInformation="TRUE"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_html_vc_custom.pdb"\r
+ TargetMachine="1"/>\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmsw29u_html.lib"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
<Configuration\r
- Name="Debug|Win32"\r
- OutputDirectory="..\..\lib\vc_lib"\r
- IntermediateDirectory="vc_mswud\html"\r
- ConfigurationType="4"\r
+ Name="DLL Universal Release|Win32"\r
+ OutputDirectory="..\..\lib\vc_dll"\r
+ IntermediateDirectory="vc_mswunivudll\html"\r
+ ConfigurationType="2"\r
UseOfMFC="0"\r
- ATLMinimizesCRunTimeLibraryUsage="false"\r
- CharacterSet="1">\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCIDLTool"/>\r
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+ CharacterSet="1">\r
<Tool\r
Name="VCCLCompilerTool"\r
- Optimization="0"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- MinimalRebuild="true"\r
- ExceptionHandling="1"\r
- AdditionalOptions=""\r
- RuntimeLibrary="3"\r
- PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
- BasicRuntimeChecks="3"\r
- DebugInformationFormat="3"\r
- Detect64BitPortabilityProblems="true"\r
- RuntimeTypeInfo="true"\r
+ Optimization="2"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ ExceptionHandling="TRUE"\r
+ RuntimeLibrary="2"\r
+ RuntimeTypeInfo="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="wx/wxprec.h"\r
- PrecompiledHeaderFile="vc_mswud\wxprec_htmllib.pch"\r
- AssemblerListingLocation="vc_mswud\html\"\r
- ObjectFile="vc_mswud\html\"\r
- ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_html.pdb"\r
+ PrecompiledHeaderFile="vc_mswunivudll\wxprec_htmldll.pch"\r
+ ObjectFile="vc_mswunivudll\html\"\r
+ ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.pdb"\r
WarningLevel="4"\r
- SuppressStartupBanner="true"/>\r
+ SuppressStartupBanner="TRUE"\r
+ Detect64BitPortabilityProblems="TRUE"\r
+ DebugInformationFormat="3"/>\r
<Tool\r
- Name="VCManagedResourceCompilerTool"/>\r
+ Name="VCCustomBuildTool"/>\r
<Tool\r
- Name="VCResourceCompilerTool"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
- PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"/>\r
+ Name="VCLinkerTool"\r
+ AdditionalOptions=""\r
+ 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"\r
+ OutputFile="..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.dll"\r
+ LinkIncremental="1"\r
+ ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_html.lib"\r
+ SuppressStartupBanner="TRUE"\r
+ AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+ GenerateDebugInformation="TRUE"\r
+ ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_html_vc_custom.pdb"\r
+ TargetMachine="1"\r
+ OptimizeReferences="2"\r
+ EnableCOMDATFolding="2"/>\r
+ <Tool\r
+ Name="VCMIDLTool"\r
+ PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
+ <Tool\r
+ Name="VCPostBuildEventTool"/>\r
+ <Tool\r
+ Name="VCPreBuildEventTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="..\..\lib\vc_lib\wxmsw29ud_html.lib"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCResourceCompilerTool"\r
+ PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML"\r
+ Culture="1033"\r
+ AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
<Tool\r
- Name="VCALinkTool"/>\r
+ Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
- Name="VCXDCMakeTool"/>\r
+ Name="VCXMLDataGeneratorTool"/>\r
<Tool\r
- Name="VCBscMakeTool"\r
- OutputFile="..\..\lib\vc_lib\wx_vc7_html.bsc"\r
- SuppressStartupBanner="true"/>\r
+ Name="VCWebDeploymentTool"/>\r
<Tool\r
- Name="VCFxCopTool"/>\r
+ Name="VCManagedWrapperGeneratorTool"/>\r
<Tool\r
- Name="VCPostBuildEventTool"/>\r
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
</Configuration>\r
</Configurations>\r
<References>\r
<File\r
RelativePath="..\..\src\common\dummy.cpp">\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32">\r
+ Name="Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32">\r
+ Name="Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32">\r
+ Name="Universal Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32">\r
+ Name="Universal Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Release|Win32">\r
+ Name="DLL Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32">\r
+ Name="DLL Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32">\r
+ Name="DLL Universal Debug|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32">\r
+ Name="DLL Universal Release|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
Name="MSW Sources"\r
UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
<File\r
- RelativePath="..\..\src\msw\helpbest.cpp"/>\r
+ RelativePath="..\..\src\msw\helpbest.cpp">\r
+ </File>\r
<File\r
RelativePath="..\..\src\msw\version.rc">\r
<FileConfiguration\r
- Name="Universal Release|Win32"\r
- ExcludedFromBuild="true"/>\r
- <FileConfiguration\r
- Name="Universal Debug|Win32"\r
- ExcludedFromBuild="true"/>\r
+ Name="Debug|Win32"\r
+ ExcludedFromBuild="TRUE"/>\r
<FileConfiguration\r
Name="Release|Win32"\r
- ExcludedFromBuild="true"/>\r
+ ExcludedFromBuild="TRUE"/>\r
<FileConfiguration\r
- Name="Debug|Win32"\r
- ExcludedFromBuild="true"/>\r
+ Name="Universal Debug|Win32"\r
+ ExcludedFromBuild="TRUE"/>\r
+ <FileConfiguration\r
+ Name="Universal Release|Win32"\r
+ ExcludedFromBuild="TRUE"/>\r
</File>\r
</Filter>\r
<Filter\r
Name="Generic Sources"\r
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
<File\r
- RelativePath="..\..\src\generic\htmllbox.cpp"/>\r
+ RelativePath="..\..\src\generic\htmllbox.cpp">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="wxHTML Sources"\r
UniqueIdentifier="{2F6FA2A9-E2B7-5B50-9F90-38855A21AF00}">\r
<File\r
- RelativePath="..\..\src\html\helpctrl.cpp"/>\r
+ RelativePath="..\..\src\html\helpctrl.cpp">\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\src\html\helpdata.cpp">\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\src\html\helpdlg.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\helpdata.cpp"/>\r
+ RelativePath="..\..\src\html\helpfrm.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\helpdlg.cpp"/>\r
+ RelativePath="..\..\src\html\helpwnd.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\helpfrm.cpp"/>\r
+ RelativePath="..\..\src\html\htmlcell.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\helpwnd.cpp"/>\r
+ RelativePath="..\..\src\html\htmlfilt.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmlcell.cpp"/>\r
+ RelativePath="..\..\src\html\htmlpars.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmlfilt.cpp"/>\r
+ RelativePath="..\..\src\html\htmltag.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmlpars.cpp"/>\r
+ RelativePath="..\..\src\html\htmlwin.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmltag.cpp"/>\r
+ RelativePath="..\..\src\html\htmprint.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmlwin.cpp"/>\r
+ RelativePath="..\..\src\html\m_dflist.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\htmprint.cpp"/>\r
+ RelativePath="..\..\src\html\m_fonts.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_dflist.cpp"/>\r
+ RelativePath="..\..\src\html\m_hline.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_fonts.cpp"/>\r
+ RelativePath="..\..\src\html\m_image.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_hline.cpp"/>\r
+ RelativePath="..\..\src\html\m_layout.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_image.cpp"/>\r
+ RelativePath="..\..\src\html\m_links.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_layout.cpp"/>\r
+ RelativePath="..\..\src\html\m_list.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_links.cpp"/>\r
+ RelativePath="..\..\src\html\m_pre.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_list.cpp"/>\r
+ RelativePath="..\..\src\html\m_span.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_pre.cpp"/>\r
+ RelativePath="..\..\src\html\m_style.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_style.cpp"/>\r
+ RelativePath="..\..\src\html\m_tables.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\m_tables.cpp"/>\r
+ RelativePath="..\..\src\html\styleparams.cpp">\r
+ </File>\r
<File\r
- RelativePath="..\..\src\html\winpars.cpp"/>\r
+ RelativePath="..\..\src\html\winpars.cpp">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Setup Headers"\r
<File\r
RelativePath="..\..\include\wx\msw\setup.h">\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32"/>\r
- <FileConfiguration\r
- Name="DLL Universal Debug|Win32"/>\r
- <FileConfiguration\r
- Name="DLL Release|Win32">\r
+ Name="Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32">\r
+ Name="Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="Universal Release|Win32"/>\r
<FileConfiguration\r
Name="Universal Debug|Win32"/>\r
<FileConfiguration\r
- Name="Release|Win32">\r
+ Name="Universal Release|Win32"/>\r
+ <FileConfiguration\r
+ Name="DLL Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32">\r
+ Name="DLL Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
</FileConfiguration>\r
+ <FileConfiguration\r
+ Name="DLL Universal Debug|Win32"/>\r
+ <FileConfiguration\r
+ Name="DLL Universal Release|Win32"/>\r
</File>\r
<File\r
RelativePath="..\..\include\wx\univ\setup.h">\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32">\r
+ Name="Debug|Win32"/>\r
+ <FileConfiguration\r
+ Name="Release|Win32"/>\r
+ <FileConfiguration\r
+ Name="Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Universal Debug|Win32">\r
+ Name="Universal Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL Release|Win32"/>\r
<FileConfiguration\r
Name="DLL Debug|Win32"/>\r
<FileConfiguration\r
- Name="Universal Release|Win32">\r
+ Name="DLL Release|Win32"/>\r
+ <FileConfiguration\r
+ Name="DLL Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32">\r
+ Name="DLL Universal Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- CommandLine="copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
- AdditionalDependencies=""$(INTDIR)" "$(OUTDIR)""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ CommandLine="copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="Release|Win32"/>\r
- <FileConfiguration\r
- Name="Debug|Win32"/>\r
</File>\r
</Filter>\r
<Filter\r
<File\r
RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
<FileConfiguration\r
- Name="DLL Universal Release|Win32">\r
- <Tool\r
- Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL Universal Debug|Win32">\r
+ Name="Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Release|Win32">\r
+ Name="Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="DLL Debug|Win32">\r
+ Name="Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
Name="Universal Release|Win32">\r
AdditionalDependencies=""..\..\lib\vc_lib\mswunivu\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Universal Debug|Win32">\r
+ Name="DLL Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswunivud\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswud\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Release|Win32">\r
+ Name="DLL Release|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswu\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswu\wx\msw""/>\r
</FileConfiguration>\r
<FileConfiguration\r
- Name="Debug|Win32">\r
+ Name="DLL Universal Debug|Win32">\r
<Tool\r
Name="VCCustomBuildTool"\r
- Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
- CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h""\r
- Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
- AdditionalDependencies=""..\..\lib\vc_lib\mswud\wx\msw""/>\r
+ Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswunivud\wx\msw""/>\r
+ </FileConfiguration>\r
+ <FileConfiguration\r
+ Name="DLL Universal Release|Win32">\r
+ <Tool\r
+ Name="VCCustomBuildTool"\r
+ Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+ CommandLine="cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h""\r
+ Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+ AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/>\r
</FileConfiguration>\r
</File>\r
<File\r
- RelativePath="..\..\include\wx\msw\helpbest.h"/>\r
+ RelativePath="..\..\include\wx\msw\helpbest.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="wxHTML Headers"\r
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
<File\r
- RelativePath="..\..\include\wx\html\helpctrl.h"/>\r
+ RelativePath="..\..\include\wx\html\helpctrl.h">\r
+ </File>\r
+ <File\r
+ RelativePath="..\..\include\wx\html\helpdata.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\helpdata.h"/>\r
+ RelativePath="..\..\include\wx\html\helpdlg.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\helpdlg.h"/>\r
+ RelativePath="..\..\include\wx\html\helpfrm.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\helpfrm.h"/>\r
+ RelativePath="..\..\include\wx\html\helpwnd.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\helpwnd.h"/>\r
+ RelativePath="..\..\include\wx\html\htmlcell.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmlcell.h"/>\r
+ RelativePath="..\..\include\wx\html\htmldefs.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmldefs.h"/>\r
+ RelativePath="..\..\include\wx\html\htmlfilt.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmlfilt.h"/>\r
+ RelativePath="..\..\include\wx\html\htmlpars.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmlpars.h"/>\r
+ RelativePath="..\..\include\wx\html\htmlproc.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmlproc.h"/>\r
+ RelativePath="..\..\include\wx\html\htmltag.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmltag.h"/>\r
+ RelativePath="..\..\include\wx\html\htmlwin.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmlwin.h"/>\r
+ RelativePath="..\..\include\wx\html\htmprint.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\htmprint.h"/>\r
+ RelativePath="..\..\include\wx\html\m_templ.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\m_templ.h"/>\r
+ RelativePath="..\..\include\wx\html\styleparams.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\html\winpars.h"/>\r
+ RelativePath="..\..\include\wx\html\winpars.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Common Headers"\r
UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
<File\r
- RelativePath="..\..\include\wx\htmllbox.h"/>\r
+ RelativePath="..\..\include\wx\htmllbox.h">\r
+ </File>\r
<File\r
- RelativePath="..\..\include\wx\wxhtml.h"/>\r
+ RelativePath="..\..\include\wx\wxhtml.h">\r
+ </File>\r
</Filter>\r
</Files>\r
<Globals>\r