[geos-commits] r3517 - trunk

[svn_geos at osgeo.org]

Author: mloskot
Date: 2011-11-05 20:25:10 -0700 (Sat, 05 Nov 2011)
New Revision: 3517

Modified:
   trunk/nmake.opt
Log:
* GEOS builds with Visual C++ from Visual Studio 11(Developer Preview).
* Added related _NMAKE_VER case to nmake.opt.

Modified: trunk/nmake.opt
===================================================================
--- trunk/nmake.opt	2011-11-04 20:52:23 UTC (rev 3516)
+++ trunk/nmake.opt	2011-11-06 03:25:10 UTC (rev 3517)
@@ -3,8 +3,10 @@
 #
 !MESSAGE **********************************************************************
 !MESSAGE *** GEOS Build Configuration ***
-!INCLUDE <ntwin32.mak>
 
+# TODO: Confirm as redundant and remove, nmake /P displays _NMAKE_VER anyway.
+#!INCLUDE <ntwin32.mak>
+
 ###############################################################################
 # For convenience, user may put custom settings to private mynmake.opt
 # and use EXT_NMAKE_OPT option while calling nmake.exe, as follows:
@@ -87,6 +89,9 @@
 !ELSEIF "$(_NMAKE_VER)" == "10.00.30319.01"
 GEOS_MSVC = 10.0
 GEOS_MSC = 1600
+!ELSEIF "$(_NMAKE_VER)" == "11.00.40825.2"
+GEOS_MSVC = 11.0
+GEOS_MSC = 1700
 !ELSE
 GEOS_MSVC = 0.0
 GEOS_MSC = 0