[mapserver-commits] r8600 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-02-21 11:19:45 -0500 (Sat, 21 Feb 2009)
New Revision: 8600

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/nmake.opt
Log:
Fixed the compiler options for MSVC 2008 (#2898)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-19 17:49:47 UTC (rev 8599)
+++ trunk/mapserver/HISTORY.TXT	2009-02-21 16:19:45 UTC (rev 8600)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed the compiler options for MSVC 2008 (#2898)
+
 Version 5.4.0-beta1 (2009-2-18):
 --------------------------------
 

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2009-02-19 17:49:47 UTC (rev 8599)
+++ trunk/mapserver/nmake.opt	2009-02-21 16:19:45 UTC (rev 8600)
@@ -55,7 +55,7 @@
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Check compiler version given in command line
 # nmake -f makefile.vc MSVC_VER=xxxx
-# 1310 = 7.1 (2003)   1400 = 8.0 (2005)
+# 1310 = 7.1 (2003)   1400 = 8.0 (2005) 1500 = 9.0 (2006)
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 !IFNDEF MSVC_VER
 #assume msvc 7.1
@@ -87,7 +87,7 @@
 # Optmization, debug, and related compile flags.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-!IF $(MSVC_VER) == 1400
+!IF $(MSVC_VER) >= 1400
 !IFNDEF MS_DEBUG
 # Optimized, with using MSVCRT. 
 OPTFLAGS =	/nologo /Ox /MD $(WARNING_LEVEL) $(DEBUG) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE