[mapserver-commits] r9880 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2010-02-23 11:21:17 -0500 (Tue, 23 Feb 2010)
New Revision: 9880

Modified:
   trunk/mapserver/Makefile.vc
   trunk/mapserver/mapagg2.cpp
   trunk/mapserver/nmake.opt
Log:
Fixed the broken build on Windows, added dependency to libexpat for AGG

Modified: trunk/mapserver/Makefile.vc
===================================================================
--- trunk/mapserver/Makefile.vc	2010-02-23 16:15:10 UTC (rev 9879)
+++ trunk/mapserver/Makefile.vc	2010-02-23 16:21:17 UTC (rev 9880)
@@ -34,7 +34,7 @@
 		mapraster.obj cgiutil.obj mapsde.obj mapogr.obj maptime.obj \
 		maptemplate.obj mappostgis.obj maplayer.obj mapresample.obj \
 		mapwms.obj mapwmslayer.obj mapgml.obj maporaclespatial.obj \
-		mapprojhack.obj mapdraw.obj mapgd.obj mapoutput.obj mapswf.obj \
+		mapprojhack.obj mapdraw.obj mapgd.obj mapgd2.obj mapoutput.obj mapswf.obj \
 		mapgdal.obj mapwfs.obj mapwfs11.obj mapwfslayer.obj mapows.obj maphttp.obj \
 		mappdf.obj mapcontext.obj mapdrawgdal.obj mapjoin.obj mapgraticule.obj \
 		mapmygis.obj mapimagemap.obj mapcopy.obj maprasterquery.obj \
@@ -43,7 +43,7 @@
 		mapgeos.obj strptime.obj \
 		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 \
+		maplibxml2.obj mapdebug.obj mapchart.obj mapagg.obj mapagg2.obj maptclutf.obj \
 		maprendering.obj mapimageio.obj mapcairo.obj \
 		mapoglrenderer.obj mapoglcontext.obj mapogl.obj \
 		maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj $(AGG_OBJ)
@@ -111,6 +111,7 @@
 	del *.exp
 	del *.ilk
 	del *.manifest
+	del renderers\agg\*.obj
 !IFDEF DOT_NET
 	cd mapscript\csharp
 	nmake /f makefile.vc clean

Modified: trunk/mapserver/mapagg2.cpp
===================================================================
--- trunk/mapserver/mapagg2.cpp	2010-02-23 16:15:10 UTC (rev 9879)
+++ trunk/mapserver/mapagg2.cpp	2010-02-23 16:21:17 UTC (rev 9880)
@@ -272,7 +272,7 @@
 
 void* agg2CreateVectorSymbolTile(int width, int height,
         symbolObj *symbol, symbolStyleObj * style) {
-
+    return NULL;
 }
 
 void agg2RenderPixmapSymbol(imageObj *img, double x, double y,
@@ -282,7 +282,7 @@
 
 void* agg2CreatePixmapSymbolTile(int width, int height,
         symbolObj *symbol, symbolStyleObj * style) {
-
+    return NULL;
 }
 
 void agg2RenderEllipseSymbol(imageObj *image, double x, double y,
@@ -292,7 +292,7 @@
 
 void* agg2CreateEllipseSymbolTile(int width, int height,
         symbolObj *symbol, symbolStyleObj * style) {
-
+    return NULL;
 }
 
 void agg2RenderTruetypeSymbol(imageObj *img, double x, double y,
@@ -355,7 +355,7 @@
 
 void* agg2CreateTruetypeSymbolTile(int width, int height,
         symbolObj *symbol, symbolStyleObj * style) {
-
+    return NULL;
 }
 
 void agg2RenderTile(imageObj *img, imageObj *tile, double x, double y) {

Modified: trunk/mapserver/nmake.opt
===================================================================
--- trunk/mapserver/nmake.opt	2010-02-23 16:15:10 UTC (rev 9879)
+++ trunk/mapserver/nmake.opt	2010-02-23 16:21:17 UTC (rev 9880)
@@ -289,6 +289,7 @@
 #is used in Mapserver to putput high class rendering
 #
 AGG=-DUSE_AGG
+EXPAT_DIR = $(MS_BASE)\Expat 2.0.1
 
 # If you wish to use OpenGl
 #
@@ -758,14 +759,23 @@
 CAIRO_LIB= $(CAIRO_DIR)\src\cairo.lib
 !ENDIF
 
+# Setup EXPAT
+!IFDEF EXPAT_DIR
+EXPAT_INC = -I$(EXPAT_DIR)\source\lib
+EXPAT_LIB = $(EXPAT_DIR)\bin\libexpat.lib
+!ENDIF
+
 # Setup AGG
 !IFDEF AGG
-AGG_INC=-I$(FT_DIR)\include
+AGG_INC=-I$(FT_DIR)\include -Irenderers\agg\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
+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 \
+renderers\agg\src\agg_svg_parser.obj renderers\agg\src\agg_svg_path_renderer.obj \
+renderers\agg\src\agg_svg_path_tokenizer.obj
 !ENDIF
 
 # Setup PDF includes and libs
@@ -836,7 +846,7 @@
      $(CURL_LIB)  $(MING_LIB) $(PDF_LIB) \
      $(WINSOCK_LIB) $(POSTGIS_LIB) $(IMGGEN_LIB) $(ERR_LIB) \
      $(ORACLE_LIB) $(SDE_LIB) $(ICONV_LIB) $(FCGILIB) $(GEOS_LIB) \
-     $(LIBXML_LIB) $(AGG_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
+     $(LIBXML_LIB) $(EXPAT_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
 !ENDIF
 
 LIBS=$(MS_LIB) $(EXTERNAL_LIBS)
@@ -848,7 +858,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) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
+         $(AGG_INC) $(EXPAT_INC) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
 !ENDIF