From 7ec2a13e42448fa71a9527e57a56c19cc313f205 Mon Sep 17 00:00:00 2001 From: Franz Beaune Date: Sat, 2 Sep 2017 00:12:23 +0200 Subject: [PATCH] Build libtiff with zlib ("AdobeDeflate") and JPEG support --- BuildAll.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BuildAll.bat b/BuildAll.bat index 446d61401..d66a3b8b2 100644 --- a/BuildAll.bat +++ b/BuildAll.bat @@ -198,7 +198,7 @@ echo [ 6/12] Building libtiff... echo === libtiff (Debug) =========================================================== > BUILDLOG.txt xcopy /E /Q /Y %src%\libtiff\*.* . %redirect% copy /Y nmake-debug.opt nmake.opt %redirect% - nmake -f Makefile.vc %redirect% + nmake -f Makefile.vc JPEG_SUPPORT=1 JPEGDIR=%root%stage\%platform%\libjpeg-turbo-debug JPEG_INCLUDE=-I%root%stage\%platform%\libjpeg-turbo-debug\include JPEG_LIB=%root%stage\%platform%\libjpeg-turbo-debug\lib\jpeg-static.lib ZIP_SUPPORT=1 ZLIBDIR=%root%stage\%platform%\zlib ZLIB_INCLUDE=-I%root%stage\%platform%\zlib\include ZLIB_LIB=%root%stage\%platform%\zlib\lib\zlibstaticd.lib %redirect% mkdir %root%stage\%platform%\libtiff-debug\lib %redirect% mkdir %root%stage\%platform%\libtiff-debug\include %redirect% copy libtiff\libtiff.lib %root%stage\%platform%\libtiff-debug\lib %redirect% @@ -212,7 +212,7 @@ echo [ 6/12] Building libtiff... echo === libtiff (Release) ========================================================= > BUILDLOG.txt xcopy /E /Q /Y %src%\libtiff\*.* . %redirect% copy /Y nmake-release.opt nmake.opt %redirect% - nmake -f Makefile.vc %redirect% + nmake -f Makefile.vc JPEG_SUPPORT=1 JPEGDIR=%root%stage\%platform%\libjpeg-turbo-release JPEG_INCLUDE=-I%root%stage\%platform%\libjpeg-turbo-release\include JPEG_LIB=%root%stage\%platform%\libjpeg-turbo-release\lib\jpeg-static.lib ZIP_SUPPORT=1 ZLIBDIR=%root%stage\%platform%\zlib ZLIB_INCLUDE=-I%root%stage\%platform%\zlib\include ZLIB_LIB=%root%stage\%platform%\zlib\lib\zlibstatic.lib %redirect% mkdir %root%stage\%platform%\libtiff-release\lib %redirect% mkdir %root%stage\%platform%\libtiff-release\include %redirect% copy libtiff\libtiff.lib %root%stage\%platform%\libtiff-release\lib %redirect%