# HG changeset patch
# User Michael Goffioul <michael.goffioul@gmail.com>
# Date 1384057684 18000
# Node ID 75c25cc8e6b626a3f5003d46eba3c55f34c8787e
# Parent  45018a221c4a60b65148ba3a1a82efb6431ae546
[MSVC] Update FLTK and Qt patches to allow compilation with libpng16.

diff -r 45018a221c4a -r 75c25cc8e6b6 src/msvc-fltk-1.patch
--- a/src/msvc-fltk-1.patch	Sat Nov 09 23:28:04 2013 -0500
+++ b/src/msvc-fltk-1.patch	Sat Nov 09 23:28:04 2013 -0500
@@ -142,7 +142,7 @@
  syspnginc_ok=no
  if test x$enable_localpng != xyes; then
 -  AC_CHECK_LIB(png, png_read_info, 
-+  AC_CHECK_LIB(png15, png_read_info, 
++  AC_CHECK_LIB(png16, png_read_info, 
      [AC_CHECK_HEADER(png.h, 
  	AC_DEFINE(HAVE_PNG_H)
  	syspnginc_ok=yes)
@@ -152,13 +152,13 @@
      PNG=""
 -    IMAGELIBS="-lpng $IMAGELIBS"
 -    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
-+    IMAGELIBS="-lpng15 $IMAGELIBS"
-+    STATICIMAGELIBS="-lpng15 $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
      AC_DEFINE(HAVE_LIBPNG)
 -    AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
 -    AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
-+    AC_CHECK_LIB(png15,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
-+    AC_CHECK_LIB(png15,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
++    AC_CHECK_LIB(png16,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
++    AC_CHECK_LIB(png16,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
  fi
  
  AC_SUBST(JPEG)
diff -r 45018a221c4a -r 75c25cc8e6b6 src/msvc-qt-1.patch
--- a/src/msvc-qt-1.patch	Sat Nov 09 23:28:04 2013 -0500
+++ b/src/msvc-qt-1.patch	Sat Nov 09 23:28:04 2013 -0500
@@ -235,7 +235,7 @@
  SOURCES += $$PWD/qpnghandler.cpp
  contains(QT_CONFIG, system-png) {
 -    if(unix|win32-g++*): LIBS_PRIVATE  += -lpng
-+    if(unix|win32-g++*|win32-msvc*): LIBS_PRIVATE  += -lpng15
++    if(unix|win32-g++*|win32-msvc*): LIBS_PRIVATE  += -lpng16
      else:win32:          LIBS += libpng.lib
  
  } else {