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

[svn at osgeo.org]

Author: tamas
Date: 2009-03-09 17:41:59 -0400 (Mon, 09 Mar 2009)
New Revision: 8749

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/Makefile.vc
Log:
Adding -DUSE_GENERIC_MS_NINT to the WIN64 MapScript builds (#2250)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2009-03-09 21:37:48 UTC (rev 8748)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2009-03-09 21:41:59 UTC (rev 8749)
@@ -13,6 +13,8 @@
 Current Version (SVN branch-5-2)
 --------------------------------
 
+- Adding -DUSE_GENERIC_MS_NINT to the WIN64 MapScript builds (#2250)
+
 - Fixed the compiler options for MSVC 2008 (#2898)
 
 - Fixed the c# compiler options for MSVC 2008 (#2910)

Modified: branches/branch-5-2/mapserver/Makefile.vc
===================================================================
--- branches/branch-5-2/mapserver/Makefile.vc	2009-03-09 21:37:48 UTC (rev 8748)
+++ branches/branch-5-2/mapserver/Makefile.vc	2009-03-09 21:41:59 UTC (rev 8749)
@@ -134,7 +134,11 @@
 mapscriptvars: makefile.vc nmake.opt
 	-del mapscriptvars
 	echo $(MS_CURRENT) > mapscriptvars
-	echo $(MS_DEFS) -DWIN32 -D_WIN32 >> mapscriptvars
+!IFDEF WIN64
+    echo $(MS_DEFS) -DWIN32 -D_WIN32 -DUSE_GENERIC_MS_NINT >> mapscriptvars
+!ELSE
+    echo $(MS_DEFS) -DWIN32 -D_WIN32 >> mapscriptvars
+!ENDIF
 	echo $(INCLUDES) >> mapscriptvars
 	echo $(LIBS_DLL) >> mapscriptvars
 	echo $(LIBS) >> mapscriptvars