From e102f4848b6ba8905dcacde84d1eb361e20510b9 Mon Sep 17 00:00:00 2001 From: Konstantin Kopachev Date: Tue, 17 Jul 2018 12:18:50 -0700 Subject: [PATCH] Fix libtiff build on windows --- winbuild/nmake.opt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/winbuild/nmake.opt b/winbuild/nmake.opt index 28aab3479..16acabc26 100644 --- a/winbuild/nmake.opt +++ b/winbuild/nmake.opt @@ -55,18 +55,16 @@ LOGLUV_SUPPORT = 1 # Uncomment and edit following lines to enable JPEG support. # JPEG_SUPPORT = 1 -JPEGDIR = $(BUILD)\jpeg-9c -JPEG_INCLUDE = -I$(JPEGDIR) -JPEG_LIB = $(JPEGDIR)/libjpeg.lib +JPEG_INCLUDE = -I$(INCLIB) +JPEG_LIB = $(INCLIB)/libjpeg.lib # # Uncomment and edit following lines to enable ZIP support # (required for Deflate compression and Pixar log-format) # ZIP_SUPPORT = 1 -ZLIBDIR = $(BUILD)\zlib-1.2.8 -ZLIB_INCLUDE = -I$(ZLIBDIR) -ZLIB_LIB = $(ZLIBDIR)/zlib.lib +ZLIB_INCLUDE = -I$(INCLIB) +ZLIB_LIB = $(INCLIB)/zlib.lib # # Uncomment and edit following lines to enable ISO JBIG support