diff options
| -rw-r--r-- | libtiff/Makefile.vc | 12 | ||||
| -rw-r--r-- | nmake.opt | 8 |
2 files changed, 15 insertions, 5 deletions
diff --git a/libtiff/Makefile.vc b/libtiff/Makefile.vc index 843a59df..1d0a47a4 100644 --- a/libtiff/Makefile.vc +++ b/libtiff/Makefile.vc @@ -1,4 +1,4 @@ -# $Id: Makefile.vc,v 1.10 2004-11-12 13:05:35 dron Exp $ +# $Id: Makefile.vc,v 1.11 2004-11-24 11:24:20 dron Exp $ # # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org> # @@ -31,6 +31,12 @@ INCL = -I. $(JPEG_INCLUDE) $(ZLIB_INCLUDE) +!IFDEF USE_WIN_CRT_LIB +OBJ_SYSDEP_MODULE = tif_unix.obj +!ELSE +OBJ_SYSDEP_MODULE = tif_win32.obj +!ENDIF + OBJ = \ tif_aux.obj \ tif_close.obj \ @@ -64,11 +70,11 @@ OBJ = \ tif_strip.obj \ tif_thunder.obj \ tif_tile.obj \ - tif_win32.obj \ tif_version.obj \ tif_warning.obj \ tif_write.obj \ - tif_zip.obj + tif_zip.obj \ + $(OBJ_SYSDEP_MODULE) all: libtiff.lib libtiff.dll @@ -1,4 +1,4 @@ -# $Id: nmake.opt,v 1.8 2004-11-13 11:21:17 dron Exp $
+# $Id: nmake.opt,v 1.9 2004-11-24 11:24:30 dron Exp $
#
# Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
#
@@ -31,6 +31,10 @@ WINMODE = -DTIF_PLATFORM_CONSOLE
#WINMODE = -DTIF_PLATFORM_WINDOWED
+# Uncomment following line to enable using Windows Common RunTime Library
+# instead of system calls. See notes on top of tif_unix.c module for details.
+#USE_WIN_CRT_LIB = 1
+
#
# Comment out the following lines to disable internal codecs.
#
@@ -74,7 +78,7 @@ LOGLUV_SUPPORT = 1 # 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
|