Merge libpng 1.6.2 into the trunk.

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

diff --git a/src/png/projects/vstudio/libpng/libpng.vcxproj b/src/png/projects/vstudio/libpng/libpng.vcxproj
index 165bfa6ed4fa6cf9bd571743d438638a648a8dfb..42195b5e852b1ff3c032da7285510b987183f969 100644 (file)
--- a/src/png/projects/vstudio/libpng/libpng.vcxproj
+++ b/src/png/projects/vstudio/libpng/libpng.vcxproj
@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>libpng</RootNamespace>\r
   </PropertyGroup>\r
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>libpng</RootNamespace>\r
   </PropertyGroup>\r

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r

   <Import Project="$(SolutionDir)\zlib.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>DynamicLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r


@@ -63,23 +63,23 @@
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets>\r
     </CustomBuildBeforeTargets>\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets>\r
     </CustomBuildBeforeTargets>\r

-    <TargetName>$(ProjectName)15</TargetName>\r
+    <TargetName>$(ProjectName)16</TargetName>\r

   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets />\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets />\r

-    <TargetName>$(ProjectName)15</TargetName>\r
+    <TargetName>$(ProjectName)16</TargetName>\r

   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets>\r
     </CustomBuildBeforeTargets>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets>\r
     </CustomBuildBeforeTargets>\r

-    <TargetName>$(ProjectName)15</TargetName>\r
+    <TargetName>$(ProjectName)16</TargetName>\r

   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets />\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">\r
     <LinkIncremental>false</LinkIncremental>\r
     <CustomBuildBeforeTargets />\r

-    <TargetName>$(ProjectName)15</TargetName>\r
+    <TargetName>$(ProjectName)16</TargetName>\r

   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r


@@ -101,12 +101,13 @@
       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <TreatWarningAsError>true</TreatWarningAsError>\r
       <Optimization>Disabled</Optimization>\r

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r

     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <AdditionalDependencies>zlib.lib</AdditionalDependencies>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <AdditionalDependencies>zlib.lib</AdditionalDependencies>\r

-      <Version>15</Version>\r
+      <Version>16</Version>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r


@@ -163,7 +164,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <AdditionalDependencies>zlib.lib</AdditionalDependencies>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <AdditionalDependencies>zlib.lib</AdditionalDependencies>\r

-      <Version>15</Version>\r
+      <Version>16</Version>\r

       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r