[mapserver-commits] r8921 - sandbox/graphics

[svn at osgeo.org]

Author: tamas
Date: 2009-04-18 17:05:40 -0400 (Sat, 18 Apr 2009)
New Revision: 8921

Modified:
   sandbox/graphics/Makefile.vc
   sandbox/graphics/nmake.opt
Log:
Add cairo specific entries

Modified: sandbox/graphics/Makefile.vc
===================================================================
--- sandbox/graphics/Makefile.vc	2009-04-17 18:54:20 UTC (rev 8920)
+++ sandbox/graphics/Makefile.vc	2009-04-18 21:05:40 UTC (rev 8921)
@@ -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 \
-		maprendering.obj mapimageio.obj \
+		maprendering.obj mapimageio.obj mapcairo.obj \
 		mapoglrenderer.obj mapoglcontext.obj mapogl.obj \
 		maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj
 

Modified: sandbox/graphics/nmake.opt
===================================================================
--- sandbox/graphics/nmake.opt	2009-04-17 18:54:20 UTC (rev 8920)
+++ sandbox/graphics/nmake.opt	2009-04-18 21:05:40 UTC (rev 8921)
@@ -296,7 +296,12 @@
 #OGL=-DUSE_OGL
 #FTGL_DIR=$(MS_BASE)\..\ftgl-2.1.3~rc5
 
+# Cairo renderer support 
+#
+#CAIRO=-DUSE_CAIRO
+#CAIRO_DIR=$(MS_BASE)\..\cairo-1.8.6
 
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # PDF (Acrobat PDF support) 
 # ----------------------------------------------------------------------
@@ -746,6 +751,12 @@
 OGL_LIB= $(FTGL_DIR)\msvc\build\ftgl_static.lib opengl32.lib glu32.lib
 !ENDIF
 
+# Setup CAIRO
+!IFDEF CAIRO
+CAIRO_INC= -I$(CAIRO_DIR)\src
+CAIRO_LIB= $(CAIRO_DIR)\src\cairo.lib
+!ENDIF
+
 # 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
@@ -820,7 +831,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) $(FRIBIDI_LIB)
+     $(LIBXML_LIB) $(AGG_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
 !ENDIF
         
 LIBS=$(MS_LIB) $(EXTERNAL_LIBS)
@@ -832,7 +843,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) $(PNG_INC) $(FRIBIDI_INC)
+         $(AGG_INC) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
 !ENDIF
         
 
@@ -843,7 +854,8 @@
           $(USE_POINT_Z_M) $(GDAL) $(FCGIDEF) \
           $(WFS) $(WFSCLIENT) $(WCS) $(PDF) $(EGIS) \
           $(USE_GD_ANTIALIAS) $(ORACLE) $(MING_VERSION) \
-          $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(XML2_ENABLED) $(AGG) $(OGL) $(RGBA_PNG_ENABLED) $(FRIBIDI)
+          $(SDE_OPT) $(ICONV) $(GEOS) $(ZLIB) $(SOS)  $(XML2_ENABLED) $(AGG) \
+          $(OGL) $(CAIRO) $(RGBA_PNG_ENABLED) $(FRIBIDI)
 
 !IFDEF WIN64
 MS_CFLAGS=$(INCLUDES) $(MS_DEFS) -DWIN32 -D_WIN32 -DUSE_GENERIC_MS_NINT