Merge libpng 1.6.2 into the trunk.

[wxWidgets.git] / src / png / projects / vstudio / pngtest / pngtest.vcxproj

diff --git a/src/png/projects/vstudio/pngtest/pngtest.vcxproj b/src/png/projects/vstudio/pngtest/pngtest.vcxproj
index bdbd8392bc65bfbbc132e8f646f029dab4c7c473..39b8de4309e8c411724a1d6bda2910fea8611a38 100644 (file)
--- a/src/png/projects/vstudio/pngtest/pngtest.vcxproj
+++ b/src/png/projects/vstudio/pngtest/pngtest.vcxproj
@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>pngtest</RootNamespace>\r
   </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <Import Project="$(SolutionDir)\zlib.props" />\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <CharacterSet>Unicode</CharacterSet>\r
@@ -91,11 +91,12 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <BrowseInformation>true</BrowseInformation>\r
       <FloatingPointExceptions>false</FloatingPointExceptions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalDependencies>libpng15.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r
@@ -128,7 +129,7 @@
     <Link>\r
       <SubSystem>Console</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r
@@ -163,7 +164,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
-      <AdditionalDependencies>libpng15.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
     <CustomBuildStep>\r
@@ -198,7 +199,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies>\r
+      <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>\r
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r