[geos-commits] r4055 - branches/3.4

[svn_geos at osgeo.org]

Author: mloskot
Date: 2015-04-30 11:52:52 -0700 (Thu, 30 Apr 2015)
New Revision: 4055

Modified:
   branches/3.4/
   branches/3.4/NEWS
   branches/3.4/nmake.opt
Log:
Merged revision(s) 4054 from trunk:
Add NMAKE version from Visual Studio 2015 RC
........


Property changes on: branches/3.4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3981
   + /trunk:3981,4054

Modified: branches/3.4/NEWS
===================================================================
--- branches/3.4/NEWS	2015-04-30 18:35:26 UTC (rev 4054)
+++ branches/3.4/NEWS	2015-04-30 18:52:52 UTC (rev 4055)
@@ -12,6 +12,7 @@
  - Make polygonize operation interruptable
  - Make relate-based operations interruptable (#711)
  - Update for Visual Studio 2013 (#691)
+ - Update for Visual Studio 2015 (r4054)
  - Fix support of PHP bindings for version < 5.4.0 (#709)
 
 Changes in 3.4.2

Modified: branches/3.4/nmake.opt
===================================================================
--- branches/3.4/nmake.opt	2015-04-30 18:35:26 UTC (rev 4054)
+++ branches/3.4/nmake.opt	2015-04-30 18:52:52 UTC (rev 4055)
@@ -123,6 +123,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "12.00.21005.1"
 GEOS_MSVC = 12.0
 GEOS_MSC = 1800
+!ELSEIF "$(_NMAKE_VER)" == "14.00.22816.0"
+GEOS_MSVC = 14.0
+GEOS_MSC = 1900
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0