X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..4ba36292f4aa0d5767ac2d053f3a9bc9e74ba567:/build/msw/wx_vc7_wxpng.vcproj

diff --git a/build/msw/wx_vc7_wxpng.vcproj b/build/msw/wx_vc7_wxpng.vcproj
index 70a4b05674..3b99824330 100644
--- a/build/msw/wx_vc7_wxpng.vcproj
+++ b/build/msw/wx_vc7_wxpng.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,500 +17,440 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxpng"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswud\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxpngd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxpng\"
-				ObjectFile="vc_mswunivudll\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxpng.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxpng"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswu\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxpng.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxpng\"
-				ObjectFile="vc_mswunivuddll\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions="_DEBUG"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxpngd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxpng"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivud\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxpngd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxpng\"
-				ObjectFile="vc_mswudll\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions=""/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxpng.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxpng"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivu\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxpng.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxpng\"
-				ObjectFile="vc_mswuddll\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions="_DEBUG"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxpngd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxpng"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswuddll\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxpngd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxpng\"
-				ObjectFile="vc_mswunivu\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions=""/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxpng.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxpng"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswudll\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxpng.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxpng\"
-				ObjectFile="vc_mswunivud\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxpngd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxpng"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivuddll\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpngd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxpngd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxpng\"
-				ObjectFile="vc_mswu\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpng.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxpng.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxpng"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxpng"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\src\zlib"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivudll\wxpng\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxpng.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxpng.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxpng\"
-				ObjectFile="vc_mswud\wxpng\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxpngd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\zlib"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxpngd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxpng.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -519,42 +459,53 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
-			<File
-				RelativePath="..\..\src\png\png.c"/>
-			<File
-				RelativePath="..\..\src\png\pngerror.c"/>
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\png\pnggccrd.c"/>
+				RelativePath="..\..\src\png\png.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngget.c"/>
+				RelativePath="..\..\src\png\pngerror.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngmem.c"/>
+				RelativePath="..\..\src\png\pngget.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngpread.c"/>
+				RelativePath="..\..\src\png\pngmem.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngread.c"/>
+				RelativePath="..\..\src\png\pngpread.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngrio.c"/>
+				RelativePath="..\..\src\png\pngread.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngrtran.c"/>
+				RelativePath="..\..\src\png\pngrio.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngrutil.c"/>
+				RelativePath="..\..\src\png\pngrtran.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngset.c"/>
+				RelativePath="..\..\src\png\pngrutil.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngtrans.c"/>
+				RelativePath="..\..\src\png\pngset.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngvcrd.c"/>
+				RelativePath="..\..\src\png\pngtrans.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngwio.c"/>
+				RelativePath="..\..\src\png\pngwio.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngwrite.c"/>
+				RelativePath="..\..\src\png\pngwrite.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngwtran.c"/>
+				RelativePath="..\..\src\png\pngwtran.c">
+			</File>
 			<File
-				RelativePath="..\..\src\png\pngwutil.c"/>
+				RelativePath="..\..\src\png\pngwutil.c">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>