From 7fc18d4f49aef216f64f999fe63947eb9a70a7c6 Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <dron@ak4719.spb.edu>
Date: Sat, 13 Nov 2004 11:21:17 +0000
Subject: [PATCH] Changed to compile the C++ modules properly.

---
 nmake.opt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nmake.opt b/nmake.opt
index 2f88ab3a..7f0a39b2 100644
--- a/nmake.opt
+++ b/nmake.opt
@@ -1,4 +1,4 @@
-# $Id: nmake.opt,v 1.7 2004-11-02 21:00:26 fwarmerdam Exp $
+# $Id: nmake.opt,v 1.8 2004-11-13 11:21:17 dron Exp $
 #
 # Copyright (C) 2004, Andrey Kiselev <dron@remotesensing.org>
 #
@@ -100,8 +100,9 @@ CHECK_JPEG_YCBCR_SUBSAMPLING = 1
 #
 # 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
+OPTFLAGS =	/Ox /MD /GX /W3
 #OPTFLAGS = 	/Zi 
 
 # Compiler specific options. You may probably want to adjust compilation
@@ -110,12 +111,14 @@ OPTFLAGS =	/Ox
 #
 MAKE	=	nmake /nologo
 CC	=	cl /nologo
+CXX	=	cl /nologo
 AR	=	lib /nologo
 LD	=	link /nologo
 
 
-CFLAGS  =	/W3 /MD $(OPTFLAGS) $(INCL) $(WINMODE) $(EXTRAFLAGS)
-EXTRAFLAGS	=
+CFLAGS  =	$(OPTFLAGS) $(INCL) $(WINMODE) $(EXTRAFLAGS)
+CXXFLAGS =	$(OPTFLAGS) $(INCL) $(WINMODE) $(EXTRAFLAGS)
+EXTRAFLAGS =
 LIBS	=
 
 #