[geos-commits] r2966 - in branches/3.2: . source/algorithm/distance

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-03-29 13:50:45 -0400 (Mon, 29 Mar 2010)
New Revision: 2966

Modified:
   branches/3.2/
   branches/3.2/autogen.bat
   branches/3.2/nmake.opt
   branches/3.2/source/algorithm/distance/DistanceToPoint.cpp
Log:
Added NMake 10.x version to be recognized by nmake.opt (ported from trunk)


Property changes on: branches/3.2
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:2965


Property changes on: branches/3.2/autogen.bat
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: branches/3.2/nmake.opt
===================================================================
--- branches/3.2/nmake.opt	2010-03-29 17:44:36 UTC (rev 2965)
+++ branches/3.2/nmake.opt	2010-03-29 17:50:45 UTC (rev 2966)
@@ -72,6 +72,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "9.00.30729.01"
 GEOS_MSVC = 9.0
 GEOS_MSC = 1500
+!ELSEIF "$(_NMAKE_VER)" == "10.00.30128.01"
+GEOS_MSVC = 10.0
+GEOS_MSC = 1600
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0


Property changes on: branches/3.2/source/algorithm/distance/DistanceToPoint.cpp
___________________________________________________________________
Deleted: svn:mergeinfo
   -