[geos-commits] r4341 - branches/3.6

[Mateusz Loskot]

Author: mloskot
Date: 2017-03-17 11:14:50 -0700 (Fri, 17 Mar 2017)
New Revision: 4341

Modified:
   branches/3.6/
   branches/3.6/nmake.opt
Log:
Merged revision(s) 4340 from trunk:
Add NMAKE version from VS2017 RTM



Property changes on: branches/3.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.4:4056
/branches/3.5:4210
   + /branches/3.4:4056
/branches/3.5:4210
/trunk:4340

Modified: branches/3.6/nmake.opt
===================================================================
--- branches/3.6/nmake.opt	2017-03-17 18:12:49 UTC (rev 4340)
+++ branches/3.6/nmake.opt	2017-03-17 18:14:50 UTC (rev 4341)
@@ -141,6 +141,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "14.00.24210.0"
 GEOS_MSVC = 14.0
 GEOS_MSC = 1900
+!ELSEIF "$(_NMAKE_VER)" == "14.10.25017.0"
+GEOS_MSVC = 14.10
+GEOS_MSC = 1910
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0