Fix recreating of wxBitmapComboBox using untyped client data.

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

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

-  This makefile was generated by\r
-  Bakefile 0.2.5 (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,61 +17,9 @@
        </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\wxpng"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxpng\"\r
-                               ObjectFile="vc_mswunivudll\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxpng.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxpng"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxpng"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r


@@ -79,16 +27,15 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r

-                               PreprocessorDefinitions="_LIB;_DEBUG"\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
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswunivuddll\wxpng\"\r
-                               ObjectFile="vc_mswunivuddll\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"\r
+                               ObjectFile="vc_mswud\wxpng\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"\r

                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -97,10 +44,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_dll\wxpngd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxpngd.lib"\r

                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r

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

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


@@ -109,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

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

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r


@@ -124,9 +73,9 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxpng"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxpng"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r


@@ -134,13 +83,12 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r

-                               PreprocessorDefinitions="_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswudll\wxpng\"\r
-                               ObjectFile="vc_mswudll\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"\r
+                               ObjectFile="vc_mswu\wxpng\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"\r

                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -149,10 +97,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_dll\wxpng.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxpng.lib"\r

                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r

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

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


@@ -161,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

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

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r


@@ -186,14 +136,13 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r

-                               PreprocessorDefinitions="_LIB;_DEBUG"\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
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswuddll\wxpng\"\r

                                ObjectFile="vc_mswuddll\wxpng\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"\r
                                WarningLevel="3"\r
                                ObjectFile="vc_mswuddll\wxpng\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"\r
                                WarningLevel="3"\r


@@ -207,114 +156,9 @@
                                OutputFile="..\..\lib\vc_dll\wxpngd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                OutputFile="..\..\lib\vc_dll\wxpngd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxpng"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivu\wxpng\"\r
-                               ObjectFile="vc_mswunivu\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxpng.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
-                               Culture="1033"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r

-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxpng"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivud\wxpng\"\r
-                               ObjectFile="vc_mswunivud\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxpngd.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r

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


@@ -323,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

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

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r


@@ -338,9 +182,9 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxpng"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxpng"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r


@@ -348,13 +192,12 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"\r

-                               PreprocessorDefinitions="_LIB"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r

-                               AssemblerListingLocation="vc_mswu\wxpng\"\r
-                               ObjectFile="vc_mswu\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"\r
+                               ObjectFile="vc_mswudll\wxpng\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"\r

                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -363,65 +206,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_lib\wxpng.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxpng.lib"\r

                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r

-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
-                               Culture="1033"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r

-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxpng"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswud\wxpng\"\r
-                               ObjectFile="vc_mswud\wxpng\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxpngd.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r

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


@@ -430,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

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

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib"/>\r
                        <Tool\r


@@ -459,9 +249,6 @@
                        <File\r
                                RelativePath="..\..\src\png\pngerror.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\png\pngerror.c">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\src\png\pnggccrd.c">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\src\png\pngget.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\png\pngget.c">\r
                        </File>\r


@@ -489,9 +276,6 @@
                        <File\r
                                RelativePath="..\..\src\png\pngtrans.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\png\pngtrans.c">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\src\png\pngvcrd.c">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\src\png\pngwio.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\png\pngwio.c">\r
                        </File>\r