[mapserver-commits] r8634 - in trunk/mapserver: . mapscript/java

[svn at osgeo.org]

Author: tamas
Date: 2009-03-05 15:42:03 -0500 (Thu, 05 Mar 2009)
New Revision: 8634

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/java/makefile.vc
Log:
Added Java MapScript WIN64 support (#2250)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-05 06:32:31 UTC (rev 8633)
+++ trunk/mapserver/HISTORY.TXT	2009-03-05 20:42:03 UTC (rev 8634)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Added Java MapScript WIN64 support (#2250)
+
 - Fixed a problem with long running processes, embedded scalebars/legends and AGG. (#2887)
 
 - Applied patch to deal with a couple of WCS issues (time ranges, #2487) and PostGIS tileindex-based time filters (#1856)

Modified: trunk/mapserver/mapscript/java/makefile.vc
===================================================================
--- trunk/mapserver/mapscript/java/makefile.vc	2009-03-05 06:32:31 UTC (rev 8633)
+++ trunk/mapserver/mapscript/java/makefile.vc	2009-03-05 20:42:03 UTC (rev 8634)
@@ -38,10 +38,10 @@
 	$(JAVAC) edu\umn\gis\mapscript\*.java
 
 mapscript_wrap:
-        $(CC) $(CFLAGS) $(JAVA_INCLUDE) $(INCLUDES) $(MS_DEFS) -DWIN32 -D_WIN32/c mapscript_wrap.c  /Fomapscript_wrap.obj
+        $(CC) $(MS_CFLAGS) $(JAVA_INCLUDE) /c mapscript_wrap.c  /Fomapscript_wrap.obj
 
 .c.obj:	
-	$(CC) $(CFLAGS) $(JAVA_INCLUDE) $(INCLUDES) $(MS_DEFS) -DWIN32 -D_WIN32 /c $*.c /Fo$*.obj
+	$(CC) $(MS_CFLAGS) $(JAVA_INCLUDE) /c $*.c /Fo$*.obj
 
 mapscript_lib: mapscript_wrap.obj
         link /dll /debug \