[mapserver-commits] r8631 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-03-04 14:59:15 -0500 (Wed, 04 Mar 2009)
New Revision: 8631

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

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-04 13:48:15 UTC (rev 8630)
+++ trunk/mapserver/HISTORY.TXT	2009-03-04 19:59:15 UTC (rev 8631)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Adding -DUSE_GENERIC_MS_NINT to the WIN64 MapScript builds (#2250)
+
 - Fixed C# the compiler options for MSVC 2008 (#2910)
 
 - Fix build problem with mapogcsld.c when OWS services are not available (#473)

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2009-03-04 13:48:15 UTC (rev 8630)
+++ trunk/mapserver/Makefile.vc	2009-03-04 19:59:15 UTC (rev 8631)
@@ -134,7 +134,11 @@
 mapscriptvars: makefile.vc nmake.opt
 	-del mapscriptvars
 	echo $(MS_CURRENT) > 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