[mapserver-commits] r8747 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-03-09 17:33:40 -0400 (Mon, 09 Mar 2009)
New Revision: 8747

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/nmake.opt
Log:
Fixed the compiler options for MSVC 2008 (#2898)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2009-03-09 21:28:37 UTC (rev 8746)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2009-03-09 21:33:40 UTC (rev 8747)
@@ -13,6 +13,8 @@
 Current Version (SVN branch-5-2)
 --------------------------------
 
+- Fixed the compiler options for MSVC 2008 (#2898)
+
 - Fixed the c# compiler options for MSVC 2008 (#2910)
 
 - Fixed memory leaks when using msUpdate*FromString methods. (#2857) 

Modified: branches/branch-5-2/mapserver/nmake.opt
===================================================================
--- branches/branch-5-2/mapserver/nmake.opt	2009-03-09 21:28:37 UTC (rev 8746)
+++ branches/branch-5-2/mapserver/nmake.opt	2009-03-09 21:33:40 UTC (rev 8747)
@@ -88,7 +88,7 @@
 # Optmization, debug, and related compile flags.
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-!IF $(MSVC_VER) == 1400
+!IF $(MSVC_VER) >= 1400
 # Optimized, with using MSVCRT. 
 OPTFLAGS =	/nologo /Ox /MD $(WARNING_LEVEL) $(DEBUG) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 # Debug with MSVCRT