[mapserver-commits] r8990 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-05-01 15:11:06 -0400 (Fri, 01 May 2009)
New Revision: 8990

Modified:
   trunk/mapserver/Makefile.vc
   trunk/mapserver/nmake.opt
Log:
Fixed the windows builds with embedded AGG support enabled by default.

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2009-05-01 18:42:16 UTC (rev 8989)
+++ trunk/mapserver/Makefile.vc	2009-05-01 19:11:06 UTC (rev 8990)
@@ -44,7 +44,7 @@
 		mapcpl.obj mapio.obj mappool.obj mapsvg.obj mapregex.obj mappluginlayer.obj \
 		mapogcsos.obj mappostgresql.obj mapcrypto.obj mapowscommon.obj \
 		maplibxml2.obj mapdebug.obj mapchart.obj mapagg.obj maptclutf.obj \
-		maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj
+		maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj $(AGG_OBJ)
 
 MS_HDRS = 	mapserver.h mapfile.h
 
@@ -101,6 +101,7 @@
 clean:
 	del *.obj
 	del $(REGEX_OBJ)
+	del $(AGG_OBJ)
 	del *.lib
 	del *.dll
 	del $(MS_EXE)

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2009-05-01 18:42:16 UTC (rev 8989)
+++ trunk/mapserver/nmake.opt	2009-05-01 19:11:06 UTC (rev 8990)
@@ -288,8 +288,7 @@
 # The AGG (Ant-Grain Geometry) libraray http://www.antigrain.com/
 #is used in Mapserver to putput high class rendering
 #
-#AGG=-DUSE_AGG
-#AGG_DIR=$(MS_BASE)\..\agg-2.4
+AGG=-DUSE_AGG
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # PDF (Acrobat PDF support)
@@ -736,8 +735,11 @@
 
 # Setup AGG
 !IFDEF AGG
-AGG_INC=-I$(AGG_DIR)\include -I$(AGG_DIR)\include\platform\win32 -I$(FT_DIR)\include -I$(AGG_DIR)\font_freetype
-AGG_LIB= $(AGG_DIR)\src\agg.lib
+AGG_OBJ=renderers\agg\src\agg_arc.obj renderers\agg\src\agg_curves.obj renderers\agg\src\agg_vcgen_contour.obj \
+renderers\agg\src\agg_vcgen_dash.obj renderers\agg\src\agg_vcgen_stroke.obj renderers\agg\src\agg_image_filters.obj \
+renderers\agg\src\agg_line_aa_basics.obj renderers\agg\src\agg_line_profile_aa.obj renderers\agg\src\agg_sqrt_tables.obj \
+renderers\agg\src\agg_embedded_raster_fonts.obj renderers\agg\src\agg_trans_affine.obj \
+renderers\agg\src\agg_vpgen_clip_polygon.obj renderers\agg\src\agg_vpgen_clip_polyline.obj renderers\agg\src\agg_font_freetype.obj
 !ENDIF
 
 # Setup PDF includes and libs
@@ -820,7 +822,7 @@
          $(CURL_INC) $(MING_INC) $(PDF_INC) $(POSTGIS_INC) \
          $(IMGGEN_INC) $(ERR_INC) $(ORACLE_INC) $(SDE_INC)\
          $(ICONV_INC) $(FCGIINC) $(GEOS_INC) $(ZLIB_INC) $(LIBXML_INC) \
-         $(AGG_INC) $(PNG_INC) $(FRIBIDI_INC)
+         $(PNG_INC) $(FRIBIDI_INC)
 !ENDIF