[master] Imported from libpng-1.5.14.tar

projects/vstudio/WARNING

@@ -0,0 +1,23 @@
+WARNING
+=======
+Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng.
+It should use /MDd - you can change this under properties\C/C++\Code
+Generation\Runtime Library if you need to use the debug runtime for debug
+builds.  This will be changed in libpng 1.6 but is currently retained for
+compatibility with older libpng 1.5 releases.
+
+The runtime library settings for each build are as follows:
+
+           Release        Debug
+DLL         /MD            /MD
+Library     /MT            /MTd
+
+The Visual Studio 2010 defaults for a Win32 DLL or Static Library project are
+as follows:
+
+                 Release     Debug
+DLL               /MD         /MDd
+Static Library    /MD         /MDd
+
+Notice that by default static library builds use the DLL runtime, not the
+static library runtime.

projects/vstudio/libpng/libpng.vcxproj

@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libpng</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\zlib.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>

projects/vstudio/pnglibconf/pnglibconf.vcxproj

@@ -17,6 +17,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\zlib.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>

projects/vstudio/pngtest/pngtest.vcxproj

@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>pngtest</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\zlib.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>

projects/vstudio/pngvalid/pngvalid.vcxproj

@@ -23,8 +23,8 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>pngvalid</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\zlib.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>

projects/vstudio/readme.txt

@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.5.13 - September 27, 2012
+libpng version 1.5.14 - January 24, 2013
 
 Copyright (c) 1998-2010 Glenn Randers-Pehrson
 
@@ -13,6 +13,14 @@ This directory  contains support for building libpng under MicroSoft
 VisualStudio 2010.  It may also work under later versions of VisualStudio.
 You should be familiar with VisualStudio before using this directory.
 
+WARNING
+=======
+Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng.
+It should use /MDd - you can change this under properties\C/C++\Code
+Generation\Runtime Library if you need to use the debug runtime for debug
+builds.  This will be changed in libpng 1.6 but is currently retained for
+compatibility with older libpng 1.5 releases.
+
 Initial preparations
 ====================
 You must enter some information in zlib.props before attempting to build

projects/vstudio/zlib.props

@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.5.13 - September 27, 2012
+ * libpng version 1.5.14 - January 24, 2013
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
@@ -33,5 +33,13 @@
 	 below:
      -->
     <ZLibSrcDir>..\..\..\..\zlib-1.2.5</ZLibSrcDir>
+
+    <!-- The following line allows compilation for an ARM target with Visual
+         Studio 2012.  Notice that this is not supported by the Visual Studio
+         2012 IDE and that the programs that result cannot be run unless they
+         signed by Microsoft.  This is therefore untested; only Microsoft can
+         test it:
+     -->
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
 </Project>

projects/vstudio/zlib/zlib.vcxproj

@@ -34,8 +34,8 @@
   <PropertyGroup Label="Globals">
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(SolutionDir)\zlib.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>