*** empty log message ***

2 files changed, 8 insertions, 4 deletions

diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc
index b27f9cd6..8af2b875 100644
--- a/libtiff/Makefile.vc
+++ b/libtiff/Makefile.vc
@@ -1,4 +1,4 @@
-# $Id: Makefile.vc,v 1.3 2004-04-20 18:38:55 dron Exp $
+# $Id: Makefile.vc,v 1.4 2004-05-19 10:49:16 dron Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
 #
@@ -29,7 +29,7 @@
 
 !INCLUDE ..\nmake.opt
 
-INCL	= -I.
+INCL	= -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE)
 
 OBJ	= \
 	tif_aux.obj \
diff --git a/nmake.opt b/nmake.opt
index c9ea17f0..3c125e7d 100644
--- a/nmake.opt
+++ b/nmake.opt
@@ -1,4 +1,4 @@
-# $Id: nmake.opt,v 1.3 2004-04-20 14:23:10 dron Exp $

+# $Id: nmake.opt,v 1.4 2004-05-19 10:49:33 dron Exp $

 #

 # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>

 #

@@ -52,6 +52,7 @@ LOGLUV_SUPPORT	= 1
 #

 #JPEG_SUPPORT	= 1

 #JPEGDIR 	= d:/projects/jpeg-6b

+#JPEG_INCLUDE	= -I$(JPEGDIR)

 #JPEG_LIB 	= $(JPEGDIR)/Release/jpeg.lib

 

 #

@@ -66,13 +67,14 @@ LOGLUV_SUPPORT	= 1
 #

 #ZIP_SUPPORT	= 1

 #ZLIBDIR 	= d:/projects/zlib-1.2.1

+#ZLIB_INCLUDE	= -I$(ZLIBDIR)

 #ZLIB_LIB 	= $(ZLIBDIR)/zlib.lib

 

 #

 # Uncomment following line to enable Pixar log-format algorithm

 # (Zlib required).

 #

-#PIXARLOG_SUPPORT = 1

+PIXARLOG_SUPPORT = 1

 

 #

 # Comment out the following lines to disable strip chopping

@@ -85,12 +87,14 @@ STRIPCHOP_SUPPORT = 1
 # Comment out the following lines to disable treating the fourth sample with

 # no EXTRASAMPLE_ value as being ASSOCALPHA. Many packages produce RGBA

 # files but don't mark the alpha properly.

+#

 EXTRASAMPLE_AS_ALPHA_SUPPORT = 1

 

 #

 # Comment out the following lines to disable picking up YCbCr subsampling

 # info from the JPEG data stream to support files lacking the tag.

 # See Bug 168 in Bugzilla, and JPEGFixupTestSubsampling() for details.

+#

 CHECK_JPEG_YCBCR_SUBSAMPLING = 1

 

 #