Changeset 846 for trunk/src/3rdparty/libtiff/nmake.opt

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libtiff/nmake.opt (modified) (6 diffs)

trunk/src/3rdparty/libtiff/nmake.opt

@@ -1 @@
-# $Id: nmake.opt,v 1.16 2006/03/23 14:54:01 dron Exp $
+# $Id: nmake.opt,v 1.18 2006/06/07 16:33:45 dron Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>
@@ -61 +61 @@
 
 #
-# Uncomment following lines to enable Old JPEG support
-# (modified IJG JPEG library required, read the contrib\ojpeg\README first).
-#
-#OJPEG_SUPPORT = 1
-
-#
 # Uncomment and edit following lines to enable ZIP support
 # (required for Deflate compression and Pixar log-format)
@@ -76 +70 @@
 
 #
+# Uncomment and edit following lines to enable ISO JBIG support
+#
+#JBIG_SUPPORT   = 1
+#JBIGDIR        = d:/projects/jbigkit
+#JBIG_INCLUDE   = -I$(JBIGDIR)/libjbig
+#JBIG_LIB       = $(JBIGDIR)/libjbig/jbig.lib
+
+#
 # Uncomment following line to enable Pixar log-format algorithm
 # (Zlib required).
@@ -111 +113 @@
 # Pick debug or optimized build flags.  We default to an optimized build
 # with no debugging information.
-# NOTE: /GX option required if you want to build the C++ stream API
-#
-OPTFLAGS =      /Ox /MD /GX /W3
+# NOTE: /EHsc option required if you want to build the C++ stream API
+#
+OPTFLAGS =      /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE
 #OPTFLAGS =     /Zi 
 
@@ -182 +184 @@
 !IFDEF JPEG_SUPPORT
 LIBS            = $(LIBS) $(JPEG_LIB)
-EXTRAFLAGS      = -DJPEG_SUPPORT $(EXTRAFLAGS)
-!IFDEF OJPEG_SUPPORT
-EXTRAFLAGS      = -DOJPEG_SUPPORT $(EXTRAFLAGS)
-!ENDIF
+EXTRAFLAGS      = -DJPEG_SUPPORT -DOJPEG_SUPPORT $(EXTRAFLAGS)
 !ENDIF
 
@@ -196 +195 @@
 !ENDIF
 
+!IFDEF JBIG_SUPPORT
+LIBS            = $(LIBS) $(JBIG_LIB)
+EXTRAFLAGS      = -DJBIG_SUPPORT $(EXTRAFLAGS)
+!ENDIF
+
 !IFDEF STRIPCHOP_SUPPORT
 EXTRAFLAGS      = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP -DSTRIP_SIZE_DEFAULT=$(STRIP_SIZE_DEFAULT) $(EXTRAFLAGS)