[mapserver-commits] r8993 - sandbox/graphics

[svn at osgeo.org]

Author: tamas
Date: 2009-05-01 17:55:01 -0400 (Fri, 01 May 2009)
New Revision: 8993

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

Modified: sandbox/graphics/Makefile.vc
===================================================================
--- sandbox/graphics/Makefile.vc	2009-05-01 19:44:13 UTC (rev 8992)
+++ sandbox/graphics/Makefile.vc	2009-05-01 21:55:01 UTC (rev 8993)
@@ -46,7 +46,7 @@
 		maplibxml2.obj mapdebug.obj mapchart.obj mapagg.obj maptclutf.obj \
 		maprendering.obj mapimageio.obj mapcairo.obj \
 		mapoglrenderer.obj mapoglcontext.obj mapogl.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
 
@@ -103,6 +103,7 @@
 clean:
 	del *.obj
 	del $(REGEX_OBJ)
+	del $(AGG_OBJ)
 	del *.lib
 	del *.dll
 	del $(MS_EXE)

Modified: sandbox/graphics/nmake.opt
===================================================================
--- sandbox/graphics/nmake.opt	2009-05-01 19:44:13 UTC (rev 8992)
+++ sandbox/graphics/nmake.opt	2009-05-01 21:55:01 UTC (rev 8993)
@@ -289,7 +289,6 @@
 #is used in Mapserver to putput high class rendering
 #
 AGG=-DUSE_AGG
-AGG_DIR=$(MS_BASE)\..\agg-2.4
 
 # If you wish to use OpenGl
 #
@@ -759,8 +758,12 @@
 
 # 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_INC=-I$(FT_DIR)\include
+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