Added wxRichTextTableBlock class to help with table UI operations

[wxWidgets.git] / src / tiff / nmake.opt

diff --git a/src/tiff/nmake.opt b/src/tiff/nmake.opt
index f5ad2d93c346531aaa491ec60bfd4b6ade881220..833794fddf0cd0290d68451f9993a68c10dc1d74 100644 (file)
--- a/src/tiff/nmake.opt
+++ b/src/tiff/nmake.opt
@@ -1,4 +1,3 @@
-# $Id: nmake.opt,v 1.16 2006/03/23 14:54:01 dron Exp $\r
 #\r
 # Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\r
 #\r
@@ -59,12 +58,6 @@ LOGLUV_SUPPORT       = 1
 #JPEG_INCLUDE  = -I$(JPEGDIR)\r
 #JPEG_LIB      = $(JPEGDIR)/Release/jpeg.lib\r
 \r
-#\r
-# Uncomment following lines to enable Old JPEG support\r
-# (modified IJG JPEG library required, read the contrib\ojpeg\README first).\r
-#\r
-#OJPEG_SUPPORT = 1\r
-\r
 #\r
 # Uncomment and edit following lines to enable ZIP support\r
 # (required for Deflate compression and Pixar log-format)\r
@@ -74,6 +67,14 @@ LOGLUV_SUPPORT       = 1
 #ZLIB_INCLUDE  = -I$(ZLIBDIR)\r
 #ZLIB_LIB      = $(ZLIBDIR)/zlib.lib\r
 \r
+#\r
+# Uncomment and edit following lines to enable ISO JBIG support\r
+#\r
+#JBIG_SUPPORT  = 1\r
+#JBIGDIR       = d:/projects/jbigkit\r
+#JBIG_INCLUDE  = -I$(JBIGDIR)/libjbig\r
+#JBIG_LIB      = $(JBIGDIR)/libjbig/jbig.lib\r
+\r
 #\r
 # Uncomment following line to enable Pixar log-format algorithm\r
 # (Zlib required).\r
@@ -110,9 +111,9 @@ CHECK_JPEG_YCBCR_SUBSAMPLING = 1
 #\r
 # Pick debug or optimized build flags.  We default to an optimized build\r
 # with no debugging information.\r
-# NOTE: /GX option required if you want to build the C++ stream API\r
+# NOTE: /EHsc option required if you want to build the C++ stream API\r
 #\r
-OPTFLAGS =     /Ox /MD /GX /W3\r
+OPTFLAGS =     /Ox /MD /EHsc /W3 /D_CRT_SECURE_NO_DEPRECATE\r
 #OPTFLAGS =    /Zi \r
 \r
 #\r
@@ -181,10 +182,7 @@ EXTRAFLAGS = -DLOGLUV_SUPPORT $(EXTRAFLAGS)
 \r
 !IFDEF JPEG_SUPPORT\r
 LIBS           = $(LIBS) $(JPEG_LIB)\r
-EXTRAFLAGS     = -DJPEG_SUPPORT $(EXTRAFLAGS)\r
-!IFDEF OJPEG_SUPPORT\r
-EXTRAFLAGS     = -DOJPEG_SUPPORT $(EXTRAFLAGS)\r
-!ENDIF\r
+EXTRAFLAGS     = -DJPEG_SUPPORT -DOJPEG_SUPPORT $(EXTRAFLAGS)\r
 !ENDIF\r
 \r
 !IFDEF ZIP_SUPPORT\r
@@ -195,6 +193,11 @@ EXTRAFLAGS = -DPIXARLOG_SUPPORT $(EXTRAFLAGS)
 !ENDIF\r
 !ENDIF\r
 \r
+!IFDEF JBIG_SUPPORT\r
+LIBS           = $(LIBS) $(JBIG_LIB)\r
+EXTRAFLAGS     = -DJBIG_SUPPORT $(EXTRAFLAGS)\r
+!ENDIF\r
+\r
 !IFDEF STRIPCHOP_SUPPORT\r
 EXTRAFLAGS     = -DSTRIPCHOP_DEFAULT=TIFF_STRIPCHOP -DSTRIP_SIZE_DEFAULT=$(STRIP_SIZE_DEFAULT) $(EXTRAFLAGS)\r
 !ENDIF\r