[mapserver-commits] r8750 - in branches/branch-5-2/mapserver: . mapscript/java

[svn at osgeo.org]

Author: tamas
Date: 2009-03-09 17:44:35 -0400 (Mon, 09 Mar 2009)
New Revision: 8750

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapscript/java/makefile.vc
Log:
Fixed Java MapScript WIN64 builds (#2250)

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

Modified: branches/branch-5-2/mapserver/mapscript/java/makefile.vc
===================================================================
--- branches/branch-5-2/mapserver/mapscript/java/makefile.vc	2009-03-09 21:41:59 UTC (rev 8749)
+++ branches/branch-5-2/mapserver/mapscript/java/makefile.vc	2009-03-09 21:44:35 UTC (rev 8750)
@@ -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 \