From 8dd5913428d96cc454d152e9431fa150d1952960 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 30 Dec 2020 11:34:46 +1100 Subject: [PATCH] Updated libtiff to 4.2.0 --- winbuild/build_prepare.py | 6 +++--- winbuild/tiff.opt | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index fb52cb4ce..2531d5504 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -141,9 +141,9 @@ deps = { "libs": [r"*.lib"], }, "libtiff": { - "url": "https://download.osgeo.org/libtiff/tiff-4.1.0.tar.gz", - "filename": "tiff-4.1.0.tar.gz", - "dir": "tiff-4.1.0", + "url": "https://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz", + "filename": "tiff-4.2.0.tar.gz", + "dir": "tiff-4.2.0", "build": [ cmd_copy(r"{winbuild_dir}\tiff.opt", "nmake.opt"), cmd_nmake("makefile.vc", "clean"), diff --git a/winbuild/tiff.opt b/winbuild/tiff.opt index 16acabc26..d82c51678 100644 --- a/winbuild/tiff.opt +++ b/winbuild/tiff.opt @@ -66,6 +66,10 @@ ZIP_SUPPORT = 1 ZLIB_INCLUDE = -I$(INCLIB) ZLIB_LIB = $(INCLIB)/zlib.lib +# Indicate if the compiler provides strtoll/strtoull (default 1) +# Users of MSVC++ 14.0 ("Visual Studio 2015") and later should set this to 1 +HAVE_STRTOLL = 1 + # # Uncomment and edit following lines to enable ISO JBIG support #