wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / png / projects / vstudio / zlib.props

diff --git a/src/png/projects/vstudio/zlib.props b/src/png/projects/vstudio/zlib.props
index ae84b88974116bf3c1c91d3159dd08d6f17e8c76..c73bf089649898dda04ec5db0d0e8270d6075591 100644 (file)
--- a/src/png/projects/vstudio/zlib.props
+++ b/src/png/projects/vstudio/zlib.props
@@ -1,43 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- * zlib.props - location of zlib source and build
+ * zlib.props - location of zlib source
  *
- * libpng version 1.4.4 - September 23, 2010
+ * libpng version 1.6.2 - April 25, 2013
  *
- * Copyright (c) 1998-2010 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
  * and license in png.h
 
  * You must edit this file to record the location of the zlib
- * official and debug builds unless they are in the default
- * directories:
-
- *   official: zlib1
- *   debug:    zlib debug
+ * source code.
  -->
 
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0"
+   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <!-- Place the name of the directory containing the official
-         build of zlib and the corresponding header files in this
-         property.  The directory is expected to contain at least:
+    <!-- Place the name of the directory containing the source of zlib used for
+        debugging in this property.
+
+         The directory need only contain the '.c' and '.h' files from the
+        source.
+
+        If you use a relative directory name (as below) then it must be
+        relative to the project directories; these are one level deepers than
+        the directories containing this file.
 
-            zdll.lib  # The DLL import library
-            zlib.lib  # The static library
-            zlib.h    # The header file
-            zconf.h   # Another header file included by zlib.h
+        If the version of zlib you use does not match that used when the
+        distribution was built you will get warnings from pngtest that the zlib
+        versions do not match.  The zlib version used in this build is recorded
+        below:
      -->
-    <ZLib1Dir>..\..\..\..\zlib124-dll\zlib-1.2.4</ZLib1Dir>
+    <ZLibSrcDir>..\..\..\..\zlib-1.2.5</ZLibSrcDir>
 
-    <!-- Place the name of the directory containing the source of
-         zlib used for debugging in this property.
-         The directory need only contain the '.c' and '.h' files
-         from the source.  For your own sanity make sure that the
-         '.h' files in the source match those from the 'official'
-         build above.
+    <!-- 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:
      -->
-    <ZLibSrcDir>..\..\..\..\zlib-1.2.4</ZLibSrcDir>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
 </Project>