Add new definitions required by MinGW for webview. Re-enable custom schemes as a...

[wxWidgets.git] / build / msw / wx_vc7_wxzlib.vcproj

diff --git a/build/msw/wx_vc7_wxzlib.vcproj b/build/msw/wx_vc7_wxzlib.vcproj
index c0f180feb960ec6927055f6caab2208e4ecaffe7..e9b443af1a8cf36a1710571de0263bf94b72b24b 100644 (file)
--- a/build/msw/wx_vc7_wxzlib.vcproj
+++ b/build/msw/wx_vc7_wxzlib.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \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
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -17,500 +17,440 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxzlib"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswud\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxzlibd.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxzlib\"\r
-                               ObjectFile="vc_mswunivudll\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions=""/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxzlib.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxzlib"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswu\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxzlib.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxzlib\"\r
-                               ObjectFile="vc_mswunivuddll\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="_DEBUG"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxzlibd.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxzlib"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivud\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxzlibd.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\wxzlib\"\r
-                               ObjectFile="vc_mswudll\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions=""/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxzlib.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\wxzlib"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivu\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxzlib.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\wxzlib\"\r
-                               ObjectFile="vc_mswuddll\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="_DEBUG"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxzlibd.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxzlib"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswuddll\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxzlibd.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\wxzlib\"\r
-                               ObjectFile="vc_mswunivu\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions=""/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxzlib.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxzlib"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswudll\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxzlib.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\wxzlib\"\r
-                               ObjectFile="vc_mswunivud\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="_DEBUG"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxzlibd.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxzlib"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivuddll\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlibd.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxzlibd.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\wxzlib\"\r
-                               ObjectFile="vc_mswu\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlib.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions=""/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxzlib.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxzlib"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\wxzlib"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=""\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivudll\wxzlib\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxzlib.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxzlib.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=""\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\wxzlib\"\r
-                               ObjectFile="vc_mswud\wxzlib\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxzlibd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=""\r
-                               PreprocessorDefinitions="_DEBUG"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories=""/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxzlibd.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxzlib.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r


@@ -519,32 +459,44 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\adler32.c"/>\r
+                               RelativePath="..\..\src\zlib\adler32.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\compress.c"/>\r
+                               RelativePath="..\..\src\zlib\compress.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\crc32.c"/>\r
+                               RelativePath="..\..\src\zlib\crc32.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\deflate.c"/>\r
+                               RelativePath="..\..\src\zlib\deflate.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\gzio.c"/>\r
+                               RelativePath="..\..\src\zlib\gzio.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\infback.c"/>\r
+                               RelativePath="..\..\src\zlib\infback.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\inffast.c"/>\r
+                               RelativePath="..\..\src\zlib\inffast.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\inflate.c"/>\r
+                               RelativePath="..\..\src\zlib\inflate.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\inftrees.c"/>\r
+                               RelativePath="..\..\src\zlib\inftrees.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\trees.c"/>\r
+                               RelativePath="..\..\src\zlib\trees.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\uncompr.c"/>\r
+                               RelativePath="..\..\src\zlib\uncompr.c">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\zlib\zutil.c"/>\r
+                               RelativePath="..\..\src\zlib\zutil.c">\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r