[mapserver-commits] r10439 - sandbox/mapserver6
svn at osgeo.org
svn at osgeo.org
Wed Aug 4 16:18:09 EDT 2010
Author: assefa
Date: 2010-08-04 20:18:09 +0000 (Wed, 04 Aug 2010)
New Revision: 10439
Modified:
sandbox/mapserver6/Makefile.vc
sandbox/mapserver6/mapagg.cpp
sandbox/mapserver6/mapcairo.c
sandbox/mapserver6/mapimageio.c
sandbox/mapserver6/maplabel.c
sandbox/mapserver6/maplegend.c
sandbox/mapserver6/mapprimitive.c
sandbox/mapserver6/mapquantization.c
sandbox/mapserver6/maprendering.c
sandbox/mapserver6/mapresample.c
sandbox/mapserver6/mapscale.c
sandbox/mapserver6/mapsymbol.c
sandbox/mapserver6/nmake.opt
Log:
Correct for windows build
Modified: sandbox/mapserver6/Makefile.vc
===================================================================
--- sandbox/mapserver6/Makefile.vc 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/Makefile.vc 2010-08-04 20:18:09 UTC (rev 10439)
@@ -26,7 +26,7 @@
#
MS_DLL = libmap.dll
-MS_OBJS = maprgbapng.obj mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
+MS_OBJS = mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
mapparser.obj maplexer.obj maptree.obj \
mapsearch.obj mapstring.obj mapsymbol.obj mapfile.obj \
maplegend.obj maputil.obj mapscale.obj mapquery.obj \
@@ -36,24 +36,25 @@
mapwms.obj mapwmslayer.obj mapgml.obj maporaclespatial.obj \
mapprojhack.obj mapdraw.obj mapgd.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 \
+ mapcontext.obj mapdrawgdal.obj mapjoin.obj mapgraticule.obj \
mapmygis.obj mapimagemap.obj mapcopy.obj maprasterquery.obj \
mapogcfilter.obj mapogcsld.obj mapthread.obj mapobject.obj \
classobject.obj layerobject.obj mapwcs.obj mapwcs11.obj \
mapgeos.obj strptime.obj \
- mapcpl.obj mapio.obj mappool.obj mapsvg.obj mapregex.obj mappluginlayer.obj \
+ mapcpl.obj mapio.obj mappool.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 mapcairo.obj \
mapoglrenderer.obj mapoglcontext.obj mapogl.obj \
- maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj mapkmlrenderer.obj mapkml.obj $(AGG_OBJ)
+ maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj \
+ mapkmlrenderer.obj mapkml.obj mapdummyrenderer.obj mapgeomutil.obj mapquantization.obj $(AGG_OBJ)
MS_HDRS = mapserver.h mapfile.h
-MS_EXE = mapserv.exe \
- shp2img.exe legend.exe \
- shptree.exe scalebar.exe sortshp.exe tile4ms.exe \
- shptreevis.exe msencrypt.exe
+MS_EXE = mapserv.exe
+# shp2img.exe legend.exe \
+# shptree.exe scalebar.exe sortshp.exe tile4ms.exe \
+# shptreevis.exe msencrypt.exe
#
#
@@ -148,7 +149,8 @@
echo $(LIBS) >> mapscriptvars
findstr MS_VERSION mapserver.h | findstr define >> mapscriptvars
-install: $(MS_DLL) $(MS_EXE) python csharp java php
+#install: $(MS_DLL) $(MS_EXE) python csharp java php
+install: $(MS_DLL) $(MS_EXE)
-mkdir $(BINDIR)
xcopy /y /r /d /f $(MS_DLL) $(BINDIR)
copy *.exe $(BINDIR)
Modified: sandbox/mapserver6/mapagg.cpp
===================================================================
--- sandbox/mapserver6/mapagg.cpp 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapagg.cpp 2010-08-04 20:18:09 UTC (rev 10439)
@@ -442,7 +442,7 @@
r->m_rasterizer_aa.reset();
r->m_rasterizer_aa.filling_rule(mapserver::fill_non_zero);
- if( (style->rotation != 0 && style->rotation != M_PI*2.)|| style->scale != 1) {
+ if( (style->rotation != 0 && style->rotation != MS_PI*2.)|| style->scale != 1) {
mapserver::trans_affine image_mtx;
image_mtx *= mapserver::trans_affine_translation(-(pf.width()/2.),-(pf.height()/2.));
/*agg angles are antitrigonometric*/
Modified: sandbox/mapserver6/mapcairo.c
===================================================================
--- sandbox/mapserver6/mapcairo.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapcairo.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -170,9 +170,9 @@
#define msCairoSetSourceColor(cr, c) cairo_set_source_rgba((cr),(c)->red/255.0,(c)->green/255.0,(c)->blue/255.0,(c)->alpha/255.0);
int renderLineCairo(imageObj *img, shapeObj *p, strokeStyleObj *stroke) {
+ int i,j;
cairo_renderer *r = CAIRO_RENDERER(img);
assert(stroke->color);
- int i,j;
cairo_new_path(r->cr);
msCairoSetSourceColor(r->cr,stroke->color);
for(i=0;i<p->numlines;i++) {
@@ -319,18 +319,18 @@
int renderTruetypeSymbolCairo(imageObj *img, double x, double y, symbolObj *symbol,
symbolStyleObj *s) {
+ int unicode;
+ cairo_glyph_t glyph;
+ cairo_text_extents_t extents;
+
+ cairo_matrix_t trans;
+ double ox,oy;
cairoCacheData *cache = MS_IMAGE_RENDERER_CACHE(img);
cairo_renderer *r = CAIRO_RENDERER(img);
faceCacheObj *face = getFontFace(cache,symbol->full_font_path);
if(!face) return MS_FAILURE;
- int unicode;
- cairo_glyph_t glyph;
- cairo_text_extents_t extents;
-
- cairo_matrix_t trans;
- double ox,oy;
cairo_save(r->cr);
cairo_set_font_face(r->cr,face->face);
cairo_set_font_size(r->cr,s->scale*96/72.0);
@@ -391,10 +391,7 @@
cairoCacheData *cache = MS_RENDERER_CACHE(renderer);
faceCacheObj *face = getFontFace(cache,font);
- if(face == NULL) {
- return MS_FAILURE;
- }
-
+
char *utfptr=text;
int i,has_kerning,unicode;
unsigned long previdx=0;
@@ -403,6 +400,10 @@
cairo_text_extents_t extents;
double px=0,py=0;
+ if(face == NULL) {
+ return MS_FAILURE;
+ }
+
cairo_set_font_face(cache->dummycr,face->face);
cairo_set_font_size(cache->dummycr,size*96/72.0);
@@ -459,9 +460,6 @@
cairo_renderer *r = CAIRO_RENDERER(img);
cairoCacheData *cache = MS_IMAGE_RENDERER_CACHE(img);
faceCacheObj *face = getFontFace(cache,style->font);
- if(face == NULL) {
- return MS_FAILURE;
- }
char *utfptr=text;
int i,has_kerning,unicode;
@@ -471,6 +469,10 @@
cairo_text_extents_t extents;
double px=0,py=0;
+ if(face == NULL) {
+ return MS_FAILURE;
+ }
+
cairo_set_font_face(r->cr,face->face);
cairo_set_font_size(r->cr,style->size*96/72.0);
@@ -670,9 +672,10 @@
int getRasterBufferHandleCairo(imageObj *img, rasterBufferObj *rb) {
+ unsigned char *pb;
cairo_renderer *r = CAIRO_RENDERER(img);
rb->type = MS_BUFFER_BYTE_RGBA;
- unsigned char *pb = cairo_image_surface_get_data(r->surface);
+ pb = cairo_image_surface_get_data(r->surface);
rb->data.rgba.pixels = pb;
rb->data.rgba.row_step = cairo_image_surface_get_stride(r->surface);
rb->data.rgba.pixel_step=4;
@@ -713,12 +716,13 @@
int mergeRasterBufferCairo(imageObj *img, rasterBufferObj *rb, double opacity,
int srcX, int srcY, int dstX, int dstY, int width, int height) {
+ cairo_surface_t *src;
+ cairo_renderer *r;
//not implemented for src,dst,width and height;
if(!rb->type == MS_BUFFER_BYTE_RGBA) {
return MS_FAILURE;
}
- cairo_surface_t *src;
- cairo_renderer *r = CAIRO_RENDERER(img);
+ r = CAIRO_RENDERER(img);
src = cairo_image_surface_create_for_data(rb->data.rgba.pixels,CAIRO_FORMAT_ARGB32,
rb->width,rb->height,
Modified: sandbox/mapserver6/mapimageio.c
===================================================================
--- sandbox/mapserver6/mapimageio.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapimageio.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -235,7 +235,6 @@
}
int savePalettePNG(rasterBufferObj *rb, streamInfo *info) {
- assert(rb->type == MS_BUFFER_BYTE_PALETTE);
png_infop info_ptr;
rgbPixel rgb[256];
unsigned char a[256];
@@ -243,7 +242,9 @@
int row,sample_depth;
png_structp png_ptr = png_create_write_struct(
PNG_LIBPNG_VER_STRING, NULL,NULL,NULL);
-
+
+ assert(rb->type == MS_BUFFER_BYTE_PALETTE);
+
if (!png_ptr)
return (MS_FAILURE);
@@ -926,7 +927,7 @@
unsigned char *r,*g,*b,*a;
int transIdx = -1;
GifFileType *image;
- GifPixelType *line;;
+ GifPixelType *line;
GifRecordType recordType;
GifByteType *codeBlock, *extension;
ColorMapObject *cmap;
Modified: sandbox/mapserver6/maplabel.c
===================================================================
--- sandbox/mapserver6/maplabel.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/maplabel.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -760,11 +760,12 @@
char *msFontsetLookupFont(fontSetObj *fontset, char *fontKey) {
+ char *font;
if(!fontKey) {
msSetError(MS_TTFERR, "Requested font (NULL) not found.", "msFontsetLookupFont()");
return NULL;
}
- char *font = msLookupHashTable(&(fontset->fonts), fontKey);
+ font = msLookupHashTable(&(fontset->fonts), fontKey);
if(!font) {
msSetError(MS_TTFERR, "Requested font (%s) not found.", "msGetLabelSize()", fontKey);
return NULL;
Modified: sandbox/mapserver6/maplegend.c
===================================================================
--- sandbox/mapserver6/maplegend.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/maplegend.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -378,10 +378,7 @@
imageObj *msDrawLegend(mapObj *map, int scale_independent)
{
- if(!MS_RENDERER_PLUGIN(map->outputformat)) {
- msSetError(MS_MISCERR,"unsupported output format","msDrawLegend()");
- return NULL;
- }
+
int i,j; /* loop counters */
pointObj pnt;
int size_x, size_y=0;
@@ -399,6 +396,10 @@
typedef struct legend_struct legendlabel;
legendlabel *head=NULL,*cur=NULL;
+ if(!MS_RENDERER_PLUGIN(map->outputformat)) {
+ msSetError(MS_MISCERR,"unsupported output format","msDrawLegend()");
+ return NULL;
+ }
if(msValidateContexts(map) != MS_SUCCESS) return NULL; /* make sure there are no recursive REQUIRES or LABELREQUIRES expressions */
if(msLegendCalcSize(map, scale_independent, &size_x, &size_y, NULL) != MS_SUCCESS) return NULL;
Modified: sandbox/mapserver6/mapprimitive.c
===================================================================
--- sandbox/mapserver6/mapprimitive.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapprimitive.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -896,8 +896,9 @@
int i,j,k,beforelast; /* loop counters */
double dx,dy;
double inv_cs = 1.0 / cellsize; /* invert and multiply much faster */
+ pointObj *point;
if(shape->numlines == 0) return; /* nothing to transform */
- pointObj *point;
+
if(shape->type == MS_SHAPE_LINE) {
/*
* loop through the shape's lines, and do naive simplification
Modified: sandbox/mapserver6/mapquantization.c
===================================================================
--- sandbox/mapserver6/mapquantization.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapquantization.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -125,8 +125,8 @@
int msQuantizeRasterBuffer(rasterBufferObj *rb,
unsigned int *reqcolors, rgbaPixel *palette,
rgbaPixel *forced_palette, int num_forced_palette_entries) {
- assert(rb->type == MS_BUFFER_BYTE_RGBA);
- rgbaPixel **apixels=NULL; /* pointer to the start rows of truecolor pixels */
+ rgbaPixel **apixels=NULL; /* pointer to the start rows of truecolor pixels */
+
register rgbaPixel *pP;
register int col;
@@ -140,6 +140,7 @@
int x;
/* int channels; */
+ assert(rb->type == MS_BUFFER_BYTE_RGBA);
maxval = 255;
Modified: sandbox/mapserver6/maprendering.c
===================================================================
--- sandbox/mapserver6/maprendering.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/maprendering.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -35,9 +35,15 @@
return MS_SUCCESS;
}
void computeSymbolStyle(symbolStyleObj *s, styleObj *src, symbolObj *symbol, double scalefactor) {
- int alpha = MS_NINT(src->opacity*2.55);;
- double default_size = msSymbolGetDefaultSize(symbol);
- double target_size = (src->size==-1)?default_size:src->size;
+
+ int alpha;
+ double default_size;
+ double target_size;
+
+ alpha = MS_NINT(src->opacity*2.55);;
+ default_size = msSymbolGetDefaultSize(symbol);
+ target_size = (src->size==-1)?default_size:src->size;
+
INIT_SYMBOL_STYLE(*s);
if(symbol->type == MS_SYMBOL_PIXMAP) {
s->color = s->outlinecolor = NULL;
@@ -369,6 +375,7 @@
renderer->renderLine(image,offsetLine,&s);
}
else {
+ symbolStyleObj s;
switch (symbol->type) {
case (MS_SYMBOL_TRUETYPE): {
if(!symbol->full_font_path)
@@ -388,7 +395,7 @@
}
break;
}
- symbolStyleObj s;
+
computeSymbolStyle(&s,style,symbol,scalefactor);
if(symbol->type == MS_SYMBOL_TRUETYPE) {
if(!symbol->full_font_path)
@@ -492,17 +499,22 @@
}
goto cleanup; /*finished plain polygon*/
} else if(symbol->type == MS_SYMBOL_HATCH){
+ double width, spacing;
+
if(MS_VALID_COLOR(style->backgroundcolor)) {
ret = renderer->renderPolygon(image,offsetPolygon, &style->backgroundcolor);
if(ret != MS_SUCCESS) goto cleanup;
}
- double width = (style->width <= 0)?scalefactor:style->width*scalefactor;
+ width = (style->width <= 0)?scalefactor:style->width*scalefactor;
style->color.alpha = MS_NINT(style->opacity*2.55);
- double spacing = (style->size <= 0)?scalefactor:style->size*scalefactor;
+ spacing = (style->size <= 0)?scalefactor:style->size*scalefactor;
ret = msHatchPolygon(image,offsetPolygon,spacing,width,style->angle, &style->color);
goto cleanup;
}
else {
+ symbolStyleObj s;
+ int pw,ph;
+ imageObj *tile;
switch(symbol->type) {
case MS_SYMBOL_PIXMAP:
if(MS_SUCCESS != msPreloadImageSymbol(renderer,symbol)) {
@@ -527,9 +539,9 @@
ret = MS_FAILURE;
goto cleanup;
}
- symbolStyleObj s;
+
computeSymbolStyle(&s,style,symbol,scalefactor);
- int pw,ph;
+
if (!s.color && !s.outlinecolor && symbol->type != MS_SYMBOL_PIXMAP) {
ret = MS_SUCCESS; // nothing to do (colors are required except for PIXMAP symbols
@@ -540,7 +552,7 @@
ret = renderer->renderPolygon(image,offsetPolygon, s.backgroundcolor);
if(ret != MS_SUCCESS) goto cleanup;
}
- imageObj *tile;
+
pw = MS_NINT(symbol->sizex * s.scale)+2;
@@ -783,8 +795,9 @@
/************************************************************************/
int msCircleDrawLineSymbol(symbolSetObj *symbolset, imageObj *image, pointObj *p, double r, styleObj *style, double scalefactor)
{
+ shapeObj *circle;
if (!image) return MS_FAILURE;
- shapeObj *circle = msRasterizeArc(p->x, p->y, r, 0, 360, 0);
+ circle = msRasterizeArc(p->x, p->y, r, 0, 360, 0);
msDrawLineSymbol(symbolset, image, circle, style, scalefactor);
msFreeShape(circle);
msFree(circle);
@@ -793,8 +806,9 @@
int msCircleDrawShadeSymbol(symbolSetObj *symbolset, imageObj *image, pointObj *p, double r, styleObj *style, double scalefactor)
{
- if (!image) return MS_FAILURE;
- shapeObj *circle = msRasterizeArc(p->x, p->y, r, 0, 360, 0);
+ shapeObj *circle;
+ if (!image) return MS_FAILURE;
+ circle = msRasterizeArc(p->x, p->y, r, 0, 360, 0);
msDrawShadeSymbol(symbolset, image, circle, style, scalefactor);
msFreeShape(circle);
msFree(circle);
@@ -802,14 +816,16 @@
}
int msDrawPieSlice(symbolSetObj *symbolset, imageObj *image, pointObj *p, styleObj *style, double radius, double start, double end) {
- if (!image) return MS_FAILURE;
+
+ shapeObj *circle;
double center_x = p->x;
double center_y = p->y;
+ if (!image) return MS_FAILURE;
if(style->offsetx>0) {
center_x+=style->offsetx*cos(((-start-end)*MS_PI/360.));
center_y-=style->offsetx*sin(((-start-end)*MS_PI/360.));
}
- shapeObj *circle = msRasterizeArc(center_x, center_y, radius, start, end, 1);
+ circle = msRasterizeArc(center_x, center_y, radius, start, end, 1);
msDrawShadeSymbol(symbolset, image, circle, style, 1.0);
msFreeShape(circle);
msFree(circle);
Modified: sandbox/mapserver6/mapresample.c
===================================================================
--- sandbox/mapserver6/mapresample.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapresample.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -154,8 +154,9 @@
}
else if( src_rb->type == MS_BUFFER_BYTE_RGBA )
{
- int src_rb_off;assert( src_rb && dst_rb );
+ int src_rb_off;
rgbaArrayObj *src = &src_rb->data.rgba, *dst = &dst_rb->data.rgba;
+ assert( src_rb && dst_rb );
src_rb_off = nSrcX * src->pixel_step
+ nSrcY * src->row_step;
Modified: sandbox/mapserver6/mapscale.c
===================================================================
--- sandbox/mapserver6/mapscale.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapscale.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -165,14 +165,14 @@
shapeObj shape;
lineObj line;
pointObj points[5];
-
+ rendererVTableObj *renderer;
if(map->units == -1) {
msSetError(MS_MISCERR, "Map units not set.", "msDrawScalebar()");
return(NULL);
}
- rendererVTableObj *renderer = MS_MAP_RENDERER(map);
+ renderer = MS_MAP_RENDERER(map);
if(!renderer || !MS_MAP_RENDERER(map)->supports_pixel_buffer) {
msSetError(MS_MISCERR, "Outputformat not supported for scalebar", "msDrawScalebar()");
return(NULL);
Modified: sandbox/mapserver6/mapsymbol.c
===================================================================
--- sandbox/mapserver6/mapsymbol.c 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/mapsymbol.c 2010-08-04 20:18:09 UTC (rev 10439)
@@ -405,6 +405,7 @@
int msAddImageSymbol(symbolSetObj *symbolset, char *filename)
{
char szPath[MS_MAXPATHLEN];
+ symbolObj *symbol=NULL;
if(!symbolset) {
msSetError(MS_SYMERR, "Symbol structure unallocated.", "msAddImageSymbol()");
@@ -416,7 +417,7 @@
/* Allocate/init memory for new symbol if needed */
if (msGrowSymbolSet(symbolset) == NULL)
return -1;
- symbolObj *symbol = symbolset->symbol[symbolset->numsymbols];
+ symbol = symbolset->symbol[symbolset->numsymbols];
if(symbolset->map) {
symbol->full_pixmap_path = strdup(msBuildPath(szPath, symbolset->map->mappath, filename));
} else {
@@ -944,6 +945,9 @@
double cos_a, sin_a;
double minx=0.0, miny=0.0, maxx=0.0, maxy=0.0;
symbolObj *newSymbol = NULL;
+ double dp_x, dp_y, xcor, ycor;
+ double TOL=0.00000000001;
+ int i;
//assert(symbol->type == MS_SYMBOL_VECTOR);
@@ -952,10 +956,7 @@
angle_rad = (MS_DEG_TO_RAD*angle);
- double dp_x, dp_y, xcor, ycor;
- double TOL=0.00000000001;
- int i;
-
+
sin_a = sin(angle_rad);
cos_a = cos(angle_rad);
Modified: sandbox/mapserver6/nmake.opt
===================================================================
--- sandbox/mapserver6/nmake.opt 2010-08-02 15:24:31 UTC (rev 10438)
+++ sandbox/mapserver6/nmake.opt 2010-08-04 20:18:09 UTC (rev 10439)
@@ -59,7 +59,7 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!IFNDEF MSVC_VER
#assume msvc 7.1
-MSVC_VER=1310
+MSVC_VER=1500
!ENDIF
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -71,7 +71,7 @@
# Set the following to point to the directory adjacent to the dependent libs.
!IFNDEF MS_BASE
-MS_BASE = c:\projects\mapserver
+MS_BASE = f:\projects\mapserver-buildkit-2008\mapserver
!ENDIF
# Set the following to point to the current (mapserver) directory.
@@ -86,7 +86,7 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Optmization, debug, and related compile flags.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+MS_DEBUG=1
!IF $(MSVC_VER) >= 1400
!IFNDEF MS_DEBUG
# Optimized, with using MSVCRT.
@@ -112,7 +112,7 @@
DLLBUILD = 1
# Set the Warning level for the compiler (defaults to W1)
-WARNING_LEVEL=/W3
+WARNING_LEVEL=/W4
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Debugging Options
@@ -174,8 +174,8 @@
# GD is a required support library for MapServer 4.x.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
!IFNDEF GD_DIR
-GD_DIR=$(MS_BASE)\..\gd-2.0.33
-GD_LIB=$(GD_DIR)/bgd_i.lib
+GD_DIR=$(MS_BASE)\..\gd-2.0.35
+GD_LIB=$(GD_DIR)/gd.lib
!ENDIF
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -187,7 +187,7 @@
# this is normally not necessary.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
OUTPUT_JPEG=-DUSE_GD_JPEG
-#JPEG_DIR=$(MS_BASE)\..\jpeg-6b
+JPEG_DIR=$(MS_BASE)\..\jpeg-6b
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -202,7 +202,7 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
OUTPUT_PNG=-DUSE_GD_PNG
!IFNDEF PNG_DIR
-PNG_DIR=$(MS_BASE)\..\libpng-1.2.8
+PNG_DIR=$(MS_BASE)\..\libpng-1.2.35
!ENDIF
ZLIB_DIR=$(MS_BASE)\..\zlib-1.2.3
ZLIB_INC=-I$(ZLIB_DIR)
@@ -259,10 +259,19 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ANNOTATION_FT=-DUSE_GD_FT
!IFNDEF FT_DIR
-FT_DIR=$(MS_BASE)\..\freetype-2.1.10
+FT_DIR=$(MS_BASE)\..\freetype-2.3.9
!ENDIF
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Optional RGBA palette png output
+# ----------------------------------------------------------------------
+# Enable support for quantization of rgba pngs
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!IFDEF PNG_DIR
+RGBA_PNG_ENABLED=-DUSE_RGBA_PNG
+!ENDIF
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# MING (Macromedia Flash SWF output support)
# ----------------------------------------------------------------------
# The MING library can be used to allow MapServer to output maps in
@@ -280,7 +289,7 @@
#is used in Mapserver to putput high class rendering
#
AGG=-DUSE_AGG
-EXPAT_DIR = $(MS_BASE)\Expat 2.0.1
+EXPAT_DIR = $(MS_BASE)\..\expat-2.0.1
# If you wish to use OpenGl
#
@@ -289,10 +298,10 @@
# Cairo renderer support
#
-#CAIRO=-DUSE_CAIRO
+CAIRO=-DUSE_CAIRO
#CAIRO_DIR=$(MS_BASE)\..\cairo-1.8.6
+CAIRO_DIR=$(MS_BASE)\..\cairo-thamas
-
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# PDF (Acrobat PDF support)
# ----------------------------------------------------------------------
@@ -301,8 +310,8 @@
# See http://www.pdflib.com/products/pdflib/download-source.html to
# download the support library.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#PDF=-DUSE_PDF
-#PDF_DIR=$(MS_BASE)\..\PDFlib-Lite-6.0.2
+PDF=-DUSE_PDF
+PDF_DIR=$(MS_BASE)\..\PDFlib-Lite-7.0.4p1
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -312,8 +321,8 @@
# operations. It can only be compiled on Windows with MSVC 7.0 or
# greater (or the cygwin/mingw stack).
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#GEOS=-DUSE_GEOS
-#GEOS_DIR=$(MS_BASE)\..\geos-2.2.3
+GEOS=-DUSE_GEOS
+GEOS_DIR=$(MS_BASE)\..\geos-06232009
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -334,10 +343,14 @@
#libiconv support is used for to support double bytes (see bug 911).
#uncomment the following to build with libiconv support.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#ICONV=-DUSE_ICONV
-#ICONV_DIR=$(MS_BASE)\..\libiconv-1.9.1
+ICONV=-DUSE_ICONV
+ICONV_DIR=$(MS_BASE)\..\libiconv-1.9.1
+GIFLIB_DIR=$(MS_BASE)\..\giflib-4.1.4
+GIFLIB_INC=-I$(GIFLIB_DIR)\include
+
+
########################################################################
# Section III: Mapserver Data Input Configuration
########################################################################
@@ -350,8 +363,10 @@
# http://www.gdal.org/. Once built, enable the GDAL flag, and point
# GDAL_DIR to the directory where GDAL was built.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#GDAL=-DUSE_GDAL
-#GDAL_DIR=$(MS_BASE)\..\gdal
+GDAL=-DUSE_GDAL
+#GDAL_DIR=$(MS_BASE)\..\gdal-svn-06232009
+#GDAL_DIR=$(MS_BASE)\..\gdal-svn
+GDAL_DIR=$(MS_BASE)\..\gdal_1_7_0
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -368,10 +383,10 @@
# want to use GDAL/OGR for both raster and vector support, but GDAL_DIR
# needs only be defined once.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#OGR=-DUSE_OGR
-#GDAL_DIR=$(MS_BASE)\..\gdal
+OGR=-DUSE_OGR
+
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# JPEG Input
# ----------------------------------------------------------------------
@@ -393,16 +408,16 @@
# Postgresql native Win32 client library.
# See http://www.postgresql.org for support library.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#POSTGIS =-DUSE_POSTGIS
-#POSTGIS_DIR =$(MS_BASE)\..\postgresql-8.1.2
+POSTGIS =-DUSE_POSTGIS
+POSTGIS_DIR =$(MS_BASE)\..\postgresql-8.3.7
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Direct connectivity to Oracle Spatial.
# ----------------------------------------------------------------------
# Point this to where your ORACLE_HOME directory lives.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#ORACLE_DIR = c:\Oracle\Ora81
-#ORACLE=-DUSE_ORACLESPATIAL
+ORACLE_DIR = $(MS_BASE)\..\oracle-11.1.0.7.0
+ORACLE=-DUSE_ORACLESPATIAL
#ORACLE=-DUSE_ORACLE_PLUGIN
@@ -416,12 +431,12 @@
# available for download.
# Either set USE_SDE or USE_SDE_PLUGIN, not both.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#SDE_OPT=-DUSE_SDE
+SDE_OPT=-DUSE_SDE
#SDE_OPT= -DUSE_SDE_PLUGIN
-#SDE_VERSION = 91
-#SDE_DIR = C:\arcgis\arcsde
-#SDE_INC = -I$(SDE_SDK)\include
+SDE_VERSION = 91
+SDE_DIR = f:\projects\sde9.1
+SDE_INC = -I$(SDE_SDK)\include
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -436,9 +451,11 @@
#MSSQL2008 = YES
#ODBC_DIR="C:\progra~1\micros~1.net\vc7\platformsdk"
+#ODBC_DIR="C:\Program Files\Microsoft SDKs\Windows\v6.0A"
#ODBC_LIBS=$(ODBC_DIR)\lib\odbc32.lib $(ODBC_DIR)\lib\odbccp32.lib $(ODBC_DIR)\lib\user32.lib
-#ODBC_INC=-I"C:\progra~1\micros~1.net\vc7\platformsdk\include"
+#ODBC_INC=-I$(ODBC_DIR)\include
+
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# EPPL7 Support
# ----------------------------------------------------------------------
@@ -458,14 +475,13 @@
# http://fribidi.freedesktop.org/wiki/
# Unncomment out the following flags to build with fribidi
#---------------------------------------------------------------------
-#FRIBIDI=-DUSE_FRIBIDI
-#FRIBIDI_DIR=$(MS_BASE)\..\fribidi-0.19.1
+FRIBIDI=-DUSE_FRIBIDI
+FRIBIDI_DIR=$(MS_BASE)\..\fribidi-0.19.1
-
# ----------------------------------------------------------------------
# Enable KML support
#----------------------------------------------------------------------
-#KML=-DUSE_KML
+KML=-DUSE_KML
########################################################################
# Section IV: Mapserver OGC Configuration
@@ -475,7 +491,7 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WMS Server
# ----------------------------------------------------------------------
-#WMS=-DUSE_WMS_SVR
+WMS=-DUSE_WMS_SVR
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WMS Client
@@ -489,30 +505,29 @@
# Set the full path to the curl project directory.
# You may also need to the full path to the windows socket library.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#WMSCLIENT= -DUSE_WMS_LYR
-#CURL_DIR=$(MS_BASE)\..\curl-7.15.0
-#WINSOCK_LIB = "WSOCK32.LIB"
-#WINSOCK_LIB = "C:\Program Files\Microsoft Visual Studio\VC98\Lib\WSOCK32.LIB"
-#WINSOCK_LIB ="C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Lib\WS2_32.Lib"
+WMSCLIENT= -DUSE_WMS_LYR
+CURL_DIR=$(MS_BASE)\..\curl-7.19.4
+#WINSOCK_LIB ="C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\WS2_32.Lib"
+WINSOCK_LIB ="C:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib\WS2_32.Lib"
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WFS Client
# ----------------------------------------------------------------------
# Use -DUSE_WFS_LYR to compile with WFS client support, requires libcurl
-#WFSCLIENT= -DUSE_WFS_LYR
+WFSCLIENT= -DUSE_WFS_LYR
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WFS Server
# ----------------------------------------------------------------------
# Use -DUSE_WFS_SVR to compile with WFS server
# support, requires OGR and PROJ4
-#WFS=-DUSE_WFS_SVR
+WFS=-DUSE_WFS_SVR -DWFS_USE_LIBXML2
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# WCS Server
# ----------------------------------------------------------------------
# Use -DUSE_WCS_SVR to compile with WCS server support, requires GDAL.
-#WCS=-DUSE_WCS_SVR
+WCS=-DUSE_WCS_SVR
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -523,9 +538,9 @@
#It also needs ICONV support since the libxml windows binaries
#are built with it
#http://xmlsoft.org/index.html
-#SOS=-DUSE_SOS_SVR
-#XML2_ENABLED=-DUSE_LIBXML2
-#LIBXML_DIR=$(MS_BASE)\..\libxml2-2.6.13.win32
+SOS=-DUSE_SOS_SVR
+XML2_ENABLED=-DUSE_LIBXML2
+LIBXML_DIR=$(MS_BASE)\..\libxml2-2.7.3.win32
########################################################################
@@ -542,7 +557,7 @@
# make any MapScript bindings, eg. "nmake /f makefile.vc python", you
# will need to have SWIG installed.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#SWIG = $(MS_BASE)\..\SWIG-1.3.27\swig
+SWIG = $(MS_BASE)\..\SWIG-1.3.39\swig
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Java MapScript
@@ -558,7 +573,7 @@
# Python MapScript very likely requires USE_THREAD to be defined.
# Python 2.2 and above are supported.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#PYTHON_HOME = "$(MS_BASE)\..\Python-2.4.2"
+PYTHON_HOME = "$(MS_BASE)\..\Python-2.6.2"
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# PHP MapScript
@@ -566,8 +581,8 @@
# The PHP_REGEX hack allows you to use PHP's regex system rather than
# the normal GNU regex library. This should normally not be needed.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#PHP_HOME = $(MS_BASE)\..\php-4.4.2
-#PHP_REGEX=1
+PHP_HOME = $(MS_BASE)\..\php-5.3.1
+PHP_REGEX=1
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# .NET/C# MapScript
@@ -575,7 +590,7 @@
# .NET will of course only work with MSVC 7.0 and 7.1. Also note that
# you will definitely want USE_THREAD defined.
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#DOT_NET = YES
+DOT_NET = YES
@@ -591,8 +606,8 @@
# Proj.4 distribution (cartographic projection routines). PROJ.4 is
# also required for all OGC services (WMS, WFS, and WCS).
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#PROJ=-DUSE_PROJ -DUSE_PROJ_API_H
-#PROJ_DIR=$(MS_BASE)\..\proj-4.4.9
+PROJ=-DUSE_PROJ -DUSE_PROJ_API_H
+PROJ_DIR=$(MS_BASE)\..\proj-svn-04222009
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -639,7 +654,7 @@
# CURL include and library
!IFDEF WMSCLIENT
CURL_INC = -I$(CURL_DIR)/include
-CURL_LIB = $(CURL_DIR)/libcurl.lib
+CURL_LIB = $(CURL_DIR)/lib/libcurl_imp.lib
!ENDIF
# LIBXML include and library
@@ -656,7 +671,7 @@
# Set the png support libaries
!IFDEF PNG_DIR
!IFNDEF PNG_LIB
-PNG_LIB=$(PNG_DIR)\projects\visualc71\Win32_LIB_Release\libpng.lib $(ZLIB_DIR)/zdll.lib
+PNG_LIB=$(PNG_DIR)\projects\visualc71\Win32_LIB_Release\libpng.lib $(ZLIB_DIR)/zlib1.lib
!ENDIF
PNG_INC=-I$(PNG_DIR)
!ENDIF
@@ -669,7 +684,7 @@
# Set the FreeType library
!IFDEF FT_DIR
!IFNDEF FT_LIB
-FT_LIB=$(FT_DIR)/objs/freetype2110.lib
+FT_LIB=$(FT_DIR)/objs/win32/vc2008/freetype239.lib
!ENDIF
!ENDIF
@@ -718,9 +733,9 @@
REGEX_OBJ=$(REGEX_DIR)\regex.obj
REGEX_INC=-I$(REGEX_DIR)
!ELSE
-REGEX_OBJ=$(PHP_HOME)\regex\regcomp.obj $(PHP_HOME)\regex\regerror.obj \
- $(PHP_HOME)\regex\regexec.obj $(PHP_HOME)\regex\regfree.obj
-REGEX_INC=-I$(PHP_HOME)/regex -DPHP_NO_ALIASES
+REGEX_OBJ=$(PHP_HOME)\ext\ereg\regex\regcomp.obj $(PHP_HOME)\ext\ereg\regex\regerror.obj \
+ $(PHP_HOME)\ext\ereg\regex\regexec.obj $(PHP_HOME)\ext\ereg\regex\regfree.obj
+REGEX_INC=-I$(PHP_HOME)/ext/ereg/regex -DPHP_NO_ALIASES
!ENDIF
# REGEX needs some special flags... here they are for VC++ 6.0
@@ -760,6 +775,12 @@
EXPAT_LIB = $(EXPAT_DIR)\bin\libexpat.lib
!ENDIF
+
+# Set the GIFLIB library
+!IFDEF GIFLIB_DIR
+GIFLIB_LIB=$(GIFLIB_DIR)/lib/giflib.lib
+!ENDIF
+
# Setup AGG
!IFDEF AGG
AGG_INC=-I$(FT_DIR)\include -Irenderers\agg\include
@@ -770,7 +791,7 @@
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
+renderers\agg\src\agg_svg_path_tokenizer.obj renderers\agg\src\clipper.obj
!ENDIF
!IFDEF AGG_SVG_SYMBOL
@@ -788,7 +809,7 @@
!IFDEF ORACLE
ORACLE_INC=-I$(ORACLE_DIR)/include
!IF "$(ORACLE)" != "-DUSE_ORACLE_PLUGIN"
-ORACLE_LIB=$(ORACLE_DIR)/lib/msvc/oci.lib
+ORACLE_LIB=$(ORACLE_DIR)\lib\msvc\ociw32.lib $(ORACLE_DIR)/lib/msvc/oci.lib
!ELSE
ORACLE_LIB =
!ENDIF
@@ -812,6 +833,8 @@
FRIBIDI_LIB=$(FRIBIDI_DIR)\fribidi.lib
!ENDIF
+
+
########################################################################
# Section VIII: UMN GIS System Support
########################################################################
@@ -846,7 +869,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) $(EXPAT_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB)
+ $(LIBXML_LIB) $(EXPAT_LIB) $(OGL_LIB) $(CAIRO_LIB) $(FRIBIDI_LIB) $(GIFLIB_LIB)
!ENDIF
LIBS=$(MS_LIB) $(EXTERNAL_LIBS)
@@ -858,7 +881,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) $(EXPAT_INC) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC)
+ $(AGG_INC) $(EXPAT_INC) $(OGL_INC) $(CAIRO_INC) $(PNG_INC) $(FRIBIDI_INC) $(GIFLIB_INC)
!ENDIF
More information about the mapserver-commits
mailing list