[geos-commits] r4246 - branches/3.5

[Mateusz Loskot]

Author: mloskot
Date: 2016-08-03 12:28:22 -0700 (Wed, 03 Aug 2016)
New Revision: 4246

Modified:
   branches/3.5/
   branches/3.5/nmake.opt
Log:
Merged revision(s) 4244 from trunk:
Add NMAKE version from VS2015 Update 3


Property changes on: branches/3.5
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.4:4056
/trunk:4099-4100,4104,4112,4114
   + /branches/3.4:4056
/trunk:4099-4100,4104,4112,4114,4244

Modified: branches/3.5/nmake.opt
===================================================================
--- branches/3.5/nmake.opt	2016-08-03 19:22:12 UTC (rev 4245)
+++ branches/3.5/nmake.opt	2016-08-03 19:28:22 UTC (rev 4246)
@@ -135,6 +135,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "14.00.23026.0"
 GEOS_MSVC = 14.0
 GEOS_MSC = 1900
+!ELSEIF "$(_NMAKE_VER)" == "14.00.24210.0"
+GEOS_MSVC = 14.0
+GEOS_MSC = 1900
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0