[geos-commits] r2311 - trunk

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-04-03 11:27:05 -0400 (Fri, 03 Apr 2009)
New Revision: 2311

Modified:
   trunk/nmake.opt
Log:
Added _NMAKE_VER 9.00.21022.08 to nmake.opt. Fixed bug with using BUILD_DEBUG instead of BUILD_BATCH in nmake.opt.

Modified: trunk/nmake.opt
===================================================================
--- trunk/nmake.opt	2009-03-27 02:39:33 UTC (rev 2310)
+++ trunk/nmake.opt	2009-04-03 15:27:05 UTC (rev 2311)
@@ -35,7 +35,7 @@
 BUILD_BATCH = NO
 !ENDIF
 
-!MESSAGE *** Setting BUILD_DEBUG $(BUILD_DEBUG)
+!MESSAGE *** Setting BUILD_BATCH $(BUILD_BATCH)
 
 ###############################################################################
 # Derive version of Visual C++ being used from NMAKE if not specified
@@ -66,6 +66,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "8.00.50727.762"
 GEOS_MSVC = 8.0
 GEOS_MSC = 1400
+!ELSEIF "$(_NMAKE_VER)" == "9.00.21022.08"
+GEOS_MSVC = 9.0
+GEOS_MSC = 1500
 !ELSEIF "$(_NMAKE_VER)" == "9.00.30729.01"
 GEOS_MSVC = 9.0
 GEOS_MSC = 1500
@@ -114,11 +117,12 @@
 !ENDIF
 
 # For Visual C++ 9.0+ use multiple process build
+!IF "$(BUILD_BATCH)" == "YES"
 !IF $(GEOS_MSC) > 1400
 MPFLAGS = /MP
-BUILD_BATCH = YES
 !MESSAGE *** Setting /MP flag to number of effective processors
 !ENDIF
+!ENDIF
 
 !MESSAGE *** Using CFLAGS $(GEOS_CFLAGS)
 !MESSAGE *** Using CPPFLAGS $(GEOS_CPPFLAGS)
@@ -150,4 +154,4 @@
 LINK = link.exe
 
 !MESSAGE **********************************************************************
-# EOF
\ No newline at end of file
+# EOF