roadmap-commit — track CVS commits

[Roadmap-commit] roadmap_editor/src/agg23/src/platform/win32 agg_win32_bmp.cpp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/agg23/src/platform/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17650/src/platform/win32

Modified Files:
	agg_win32_bmp.cpp 
Log Message:
Fix blend_from for rgb_packed.

Index: agg_win32_bmp.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/src/platform/win32/agg_win32_bmp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** agg_win32_bmp.cpp	21 Apr 2006 15:53:40 -0000	1.1
--- agg_win32_bmp.cpp	29 Apr 2006 11:00:01 -0000	1.2
***************
*** 299,303 ****
          if(dvc_width != bmp_width || dvc_height != bmp_height)
          {
!             ::SetStretchBltMode(h_dc, COLORONCOLOR);
              ::StretchDIBits(
                  h_dc,            // handle of device context 
--- 299,303 ----
          if(dvc_width != bmp_width || dvc_height != bmp_height)
          {
!             //::SetStretchBltMode(h_dc, COLORONCOLOR);
              ::StretchDIBits(
                  h_dc,            // handle of device context 
***************
*** 478,482 ****
          destroy();
          m_bpp = bmi->bmiHeader.biBitCount;
!         create_from_bmp(bmi);
          m_is_internal = 1;
          return true;
--- 478,483 ----
          destroy();
          m_bpp = bmi->bmiHeader.biBitCount;
!         create_from_bmp(bmi);
!         //m_buf = (unsigned char *)bmi + bmf.bfOffBits - sizeof (BITMAPFILEHEADER);
          m_is_internal = 1;
          return true;

[Roadmap-commit] roadmap_editor/src/agg23/include agg_pixfmt_rgb_packed.h,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/agg23/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17650/include

Modified Files:
	agg_pixfmt_rgb_packed.h 
Log Message:
Fix blend_from for rgb_packed.

Index: agg_pixfmt_rgb_packed.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/agg23/include/agg_pixfmt_rgb_packed.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** agg_pixfmt_rgb_packed.h	21 Apr 2006 15:53:39 -0000	1.1
--- agg_pixfmt_rgb_packed.h	29 Apr 2006 11:00:01 -0000	1.2
***************
*** 1069,1098 ****
                          int8u cover)
          {
-             typedef typename SrcPixelFormatRenderer::order_type src_order;
- 
              const value_type* psrc = (const value_type*)psrc_;
              pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst;
              do 
              {
!                 value_type alpha = psrc[src_order::A];
                  if(alpha)
                  {
                      if(alpha == base_mask && cover == 255)
                      {
!                         *pdst = m_blender.make_pix(psrc[src_order::R], 
!                                                    psrc[src_order::G],
!                                                    psrc[src_order::B]);
                      }
                      else
                      {
                          m_blender.blend_pix(pdst, 
!                                             psrc[src_order::R],
!                                             psrc[src_order::G],
!                                             psrc[src_order::B],
!                                             alpha,
                                              cover);
                      }
                  }
!                 psrc += 4;
                  ++pdst;
              }
--- 1069,1096 ----
                          int8u cover)
          {
              const value_type* psrc = (const value_type*)psrc_;
              pixel_type* pdst = (pixel_type*)m_rbuf->row(ydst) + xdst;
              do 
              {
!                 value_type alpha = base_mask;
                  if(alpha)
                  {
                      if(alpha == base_mask && cover == 255)
                      {
!                         *pdst = m_blender.make_pix(psrc[0], 
!                                                    psrc[1],
!                                                    psrc[2]);
                      }
                      else
                      {
                          m_blender.blend_pix(pdst, 
!                                             psrc[0],
!                                             psrc[1],
!                                             psrc[2],
!                                             cover,
                                              cover);
                      }
                  }
!                 psrc += 3;
                  ++pdst;
              }

[Roadmap-commit] roadmap_editor/src/agg23 roadmap_canvas.cpp,NONE,1.1

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/agg23
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17190

Added Files:
	roadmap_canvas.cpp 
Log Message:
Add agg generic canvas implementation.

--- NEW FILE: roadmap_canvas.cpp ---
/* roadmap_canvas.cpp - manage the canvas that is used to draw the map with agg
 *
 * LICENSE:
 *
 *   Copyright 2006 Ehud Shabtai
 *
 *   This file is part of RoadMap.
 *
 *   RoadMap is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   RoadMap is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with RoadMap; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * SYNOPSYS:
 *
 *   See roadmap_canvas.h.
 */



#ifdef WIN32_PROFILE
#include <C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h>
#endif

#include <wchar.h>
#include "agg_rendering_buffer.h"
#include "agg_curves.h"
#include "agg_conv_stroke.h"
#include "agg_conv_contour.h"
#include "agg_conv_transform.h"
#include "agg_rasterizer_scanline_aa.h"
#include "agg_rasterizer_outline_aa.h"
#include "agg_rasterizer_outline.h"
#include "agg_renderer_primitives.h"
#include "agg_ellipse.h"
#include "agg_renderer_scanline.h"
#include "agg_scanline_p.h"
#include "agg_renderer_outline_aa.h"
#include "agg_pixfmt_rgb_packed.h"
#include "agg_path_storage.h"
#include "../agg23/font_freetype/agg_font_freetype.h"

#ifdef USE_FRIBIDI
#include <fribidi.h>
#define MAX_STR_LEN 65000
#endif

extern "C" {
#include "../roadmap.h"
#include "../roadmap_types.h"
#include "../roadmap_gui.h"
#include "../roadmap_screen.h"
#include "../roadmap_canvas.h"
#include "../roadmap_messagebox.h"
#include "../roadmap_math.h"
#include "../roadmap_config.h"
#include "../roadmap_path.h"
}
#include "../roadmap_canvas_agg.h"

typedef agg::pixfmt_rgb565 pixfmt;
typedef agg::renderer_base<pixfmt> renbase_type;
typedef agg::renderer_primitives<renbase_type> renderer_pr;
typedef agg::font_engine_freetype_int32 font_engine_type;
typedef agg::font_cache_manager<font_engine_type> font_manager_type;

agg::rendering_buffer agg_rbuf;

static pixfmt agg_pixf(agg_rbuf);
static agg::renderer_base<pixfmt> agg_renb;

static agg::line_profile_aa profile(2, agg::gamma_none());

static agg::renderer_outline_aa<renbase_type> reno(agg_renb, profile);
static agg::rasterizer_outline_aa< agg::renderer_outline_aa<renbase_type> >  raso(reno);

static agg::rasterizer_scanline_aa<> ras;
static agg::scanline_p8 sl;
static agg::renderer_scanline_aa_solid<agg::renderer_base<pixfmt> > ren_solid(agg_renb);

static font_engine_type             m_feng;
static font_manager_type            m_fman(m_feng);

static RoadMapConfigDescriptor RoadMapConfigFont =
                        ROADMAP_CONFIG_ITEM("Labels", "FontName");

struct roadmap_canvas_pen {	
	struct roadmap_canvas_pen *next;
	char  *name;
   agg::rgba8 color;
	int thickness;
};

static struct roadmap_canvas_pen *RoadMapPenList = NULL;
static RoadMapPen	CurrentPen;
static int        RoadMapCanvasFontLoaded = 0;

/* The canvas callbacks: all callbacks are initialized to do-nothing
 * functions, so that we don't care checking if one has been setup.
 */
static void roadmap_canvas_ignore_mouse (RoadMapGuiPoint *point) {}

RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
                                     roadmap_canvas_ignore_mouse;

RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonReleased =
                                     roadmap_canvas_ignore_mouse;

RoadMapCanvasMouseHandler RoadMapCanvasMouseMoved =
                                     roadmap_canvas_ignore_mouse;


static void roadmap_canvas_ignore_configure (void) {}

RoadMapCanvasConfigureHandler RoadMapCanvasConfigure =
                                     roadmap_canvas_ignore_configure;


void roadmap_canvas_get_text_extents 
        (const char *text, int *width, int *ascent, int *descent) {

   *ascent = 0;
   *descent = 0;

   wchar_t wstr[255];
   int length = roadmap_canvas_agg_to_wchar (text, wstr, 255);

   if (length <=0) {
      *width = 0;
      return;
   }

	double x  = 0;
	double y  = 0;
	const wchar_t* p = wstr;

	while(*p) {
		const agg::glyph_cache* glyph = m_fman.glyph(*p);

		if(glyph) {
			x += glyph->advance_x;
			y += glyph->advance_y;
			if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1;
		}
		++p;
	}

	*width = (int)x;
}


void roadmap_canvas_select_pen (RoadMapPen pen)
{
   dbg_time_start(DBG_TIME_SELECT_PEN);
   if (!CurrentPen || (pen->thickness != CurrentPen->thickness)) {
      profile.width(pen->thickness);
   }
	CurrentPen = pen;

   reno.color(pen->color);

   dbg_time_end(DBG_TIME_SELECT_PEN);

   return;	
}


RoadMapPen roadmap_canvas_create_pen (const char *name)
{
	struct roadmap_canvas_pen *pen;
	
	for (pen = RoadMapPenList; pen != NULL; pen = pen->next) {
		if (strcmp(pen->name, name) == 0) break;
	}
	
	if (pen == NULL) {
		
		pen = (struct roadmap_canvas_pen *)
			malloc (sizeof(struct roadmap_canvas_pen));
		roadmap_check_allocated(pen);
		
		pen->name = strdup (name);
		pen->color = agg::rgba8(0, 0, 0);
		pen->thickness = 1;
		pen->next = RoadMapPenList;
		
		RoadMapPenList = pen;
	}
	
	roadmap_canvas_select_pen (pen);
	
	return pen;
}


void roadmap_canvas_set_foreground (const char *color) {

   if (!CurrentPen) return;

	CurrentPen->color = roadmap_canvas_agg_parse_color(color);
	roadmap_canvas_select_pen(CurrentPen);
}


void roadmap_canvas_set_thickness (int thickness) {

   if (CurrentPen && (CurrentPen->thickness != thickness)) {
		CurrentPen->thickness = thickness;
      profile.width(thickness);
	}
}


void roadmap_canvas_set_opacity (int opacity) {

   if (!CurrentPen) return;
   CurrentPen->color.a = opacity;
	roadmap_canvas_select_pen(CurrentPen);
}


void roadmap_canvas_erase (void) {

   agg_renb.clear(CurrentPen->color);
}


void roadmap_canvas_draw_string (RoadMapGuiPoint *position,
                                 int corner,
                                 const char *text) {
	int x;
	int y;
	int text_width;
	int text_ascent;
	int text_descent;
	int text_height;
	
	roadmap_canvas_get_text_extents 
        	(text, &text_width, &text_ascent, &text_descent);
	
	text_height = text_ascent + text_descent;
	
	switch (corner) {
		
	case ROADMAP_CANVAS_TOPLEFT:
		y = position->y;
		x = position->x;
		break;
		
	case ROADMAP_CANVAS_TOPRIGHT:
		y = position->y;
		x = position->x - text_width;
		break;
		
	case ROADMAP_CANVAS_BOTTOMRIGHT:
		y = position->y - text_height;
		x = position->x - text_width;
		break;
		
	case ROADMAP_CANVAS_BOTTOMLEFT:
		y = position->y - text_height;
		x = position->x;
		break;
		
	case ROADMAP_CANVAS_CENTER:
		y = position->y - (text_height / 2);
		x = position->x - (text_width / 2);
		break;
		
	default:
		return;
	}

	RoadMapGuiPoint start = {x, y+text_height};
	roadmap_canvas_draw_string_angle (&start, position, 0, text);
}


void roadmap_canvas_draw_multiple_points (int count, RoadMapGuiPoint *points) {

   int i;

   for (i=0; i<count; i++) {

      agg_renb.copy_pixel(points[i].x, points[i].y, CurrentPen->color);
   }
}


void roadmap_canvas_draw_multiple_lines (int count, int *lines,
      RoadMapGuiPoint *points, int fast_draw) {

   int i;
   int count_of_points;
   
   dbg_time_start(DBG_TIME_DRAW_LINES);
#ifdef WIN32_PROFILE
   ResumeCAPAll();
#endif
   
   raso.round_cap(true);
   raso.accurate_join(true);

   agg::path_storage path;
   
   for (i = 0; i < count; ++i) {
      
      int first = 1;
      
      count_of_points = *lines;
      
      if (count_of_points < 2) continue;
      
      dbg_time_start(DBG_TIME_CREATE_PATH);

      for (int j=0; j<count_of_points; j++) {

         if (first) {
            first = 0;
            path.move_to(points->x, points->y);            
         } else {
            path.line_to(points->x, points->y);
         }

         points++;
      }

      dbg_time_end(DBG_TIME_CREATE_PATH);
      dbg_time_start(DBG_TIME_ADD_PATH);
      
      if (fast_draw) {
         renderer_pr ren_pr(agg_renb);
         agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
         ren_pr.line_color(CurrentPen->color);
         ras_line.add_path(path);
         
      } else {
         
         raso.add_path(path);
      }
      
      path.remove_all ();
      dbg_time_end(DBG_TIME_ADD_PATH);
      
      lines += 1;
   }
   
     
#ifdef WIN32_PROFILE
   SuspendCAPAll();
#endif
   
   dbg_time_end(DBG_TIME_DRAW_LINES);
}

void roadmap_canvas_draw_multiple_polygons
         (int count, int *polygons, RoadMapGuiPoint *points, int filled,
          int fast_draw) {

   int i;
   int count_of_points;
   
   agg::path_storage path;
   
   for (i = 0; i < count; ++i) {
      
      count_of_points = *polygons;
      
      int first = 1;
      
      for (int j=0; j<count_of_points; j++) {
         
         if (first) {
            first = 0;
            path.move_to(points->x, points->y);            
         } else {
            path.line_to(points->x, points->y);
         }
         points++;
      }
      
      path.close_polygon();
      
      if (filled) {
         
         ras.reset();
         ras.add_path(path);
         ren_solid.color(CurrentPen->color);
         agg::render_scanlines( ras, sl, ren_solid);
         
      } else if (fast_draw) {
         renderer_pr ren_pr(agg_renb);
         agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
         ren_pr.line_color(CurrentPen->color);
         ras_line.add_path(path);
         
      } else {
         
         raso.add_path(path);
      }
      
      path.remove_all ();
      
      polygons += 1;
   }
}


void roadmap_canvas_draw_multiple_circles
        (int count, RoadMapGuiPoint *centers, int *radius, int filled,
         int fast_draw) {

   int i;
   
   agg::path_storage path;
   
   for (i = 0; i < count; ++i) {
      
      int r = radius[i];
      
      int x = centers[i].x;
      int y = centers[i].y;
      
      ras.reset ();

      
      agg::ellipse e( x, y, r, r);
      path.add_path(e);
      
      if (filled) {
         
         ras.reset();
         ras.add_path(path);
         ren_solid.color(CurrentPen->color);
         agg::render_scanlines( ras, sl, ren_solid);
         
      } else if (fast_draw) {
         renderer_pr ren_pr(agg_renb);
         agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
         ren_pr.line_color(CurrentPen->color);
         ras_line.add_path(path);
         
      } else {
         
         raso.add_path(path);
      }
      
      path.remove_all ();
   }
}


void roadmap_canvas_register_button_pressed_handler
                    (RoadMapCanvasMouseHandler handler) {

   RoadMapCanvasMouseButtonPressed = handler;
}


void roadmap_canvas_register_button_released_handler
                    (RoadMapCanvasMouseHandler handler) {
       
   RoadMapCanvasMouseButtonReleased = handler;
}


void roadmap_canvas_register_mouse_move_handler
                    (RoadMapCanvasMouseHandler handler) {

   RoadMapCanvasMouseMoved = handler;
}


void roadmap_canvas_register_configure_handler
                    (RoadMapCanvasConfigureHandler handler) {

   RoadMapCanvasConfigure = handler;
}


int roadmap_canvas_width (void) {
   return agg_renb.width();
}


int roadmap_canvas_height (void) {
   return agg_renb.height();
}


void roadmap_canvas_save_screenshot (const char* filename) {
   /* NOT IMPLEMENTED. */
}


/*
** Use FRIBIDI to encode the string.
** The return value must be freed by the caller.
*/

#ifdef USE_FRIBIDI
static wchar_t* bidi_string(wchar_t *logical) {
   
   FriBidiCharType base = FRIBIDI_TYPE_ON;
   size_t len;
   
   len = wcslen(logical);
   
   FriBidiChar *visual;
   
   FriBidiStrIndex *ltov, *vtol;
   FriBidiLevel *levels;
   FriBidiStrIndex new_len;
   fribidi_boolean log2vis;
   
   visual = (FriBidiChar *) malloc (sizeof (FriBidiChar) * (len + 1));
   ltov = NULL;
   vtol = NULL;
   levels = NULL;
   
   /* Create a bidi string. */
   log2vis = fribidi_log2vis ((FriBidiChar *)logical, len, &base,
      /* output */
      visual, ltov, vtol, levels);
   
   if (!log2vis) {
      //msSetError(MS_IDENTERR, "Failed to create bidi string.", 
      //"msGetFriBidiEncodedString()");
      return NULL;
   }
   
   new_len = len;
   
   return (wchar_t *)visual;
   
}
#endif


void roadmap_canvas_draw_string_angle (RoadMapGuiPoint *position,
                                       RoadMapGuiPoint *center,
                                       int angle, const char *text)
{
   
   if (RoadMapCanvasFontLoaded != 1) return;
   
   dbg_time_start(DBG_TIME_TEXT_FULL);      
   dbg_time_start(DBG_TIME_TEXT_CNV);
   
   wchar_t wstr[255];
   int length = roadmap_canvas_agg_to_wchar (text, wstr, 255);
   if (length <=0) return;
   
#ifdef USE_FRIBIDI
   wchar_t *bidi_text = bidi_string(wstr);
   const wchar_t* p = bidi_text;
#else   
   const wchar_t* p = wstr;
#endif
   
   ren_solid.color(agg::rgba8(0, 0, 0));
   dbg_time_end(DBG_TIME_TEXT_CNV);
   
   dbg_time_start(DBG_TIME_TEXT_LOAD);
   
   double x  = 0;
   double y  = 0;
   
   dbg_time_end(DBG_TIME_TEXT_LOAD);
   while(*p) {
      dbg_time_start(DBG_TIME_TEXT_ONE_LETTER);
      dbg_time_start(DBG_TIME_TEXT_GET_GLYPH);
      const agg::glyph_cache* glyph = m_fman.glyph(*p);
      dbg_time_end(DBG_TIME_TEXT_GET_GLYPH);

      if(glyph) {
         m_fman.init_embedded_adaptors(glyph, x, y);
         
         //agg::conv_curve<font_manager_type::path_adaptor_type> stroke(m_fman.path_adaptor());
         
         agg::trans_affine mtx;
         if (abs(angle) > 5) {
            mtx *= agg::trans_affine_rotation(agg::deg2rad(angle));
         }
         mtx *= agg::trans_affine_translation(position->x, position->y);
         
         agg::conv_transform<font_manager_type::path_adaptor_type> tr(m_fman.path_adaptor(), mtx);

         agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > fill(tr);

         //agg::conv_stroke<
            //agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > > 
         //stroke(fill);

         agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> >
            stroke(tr);

         dbg_time_start(DBG_TIME_TEXT_ONE_RAS);
         
#ifdef WIN32_PROFILE
         ResumeCAPAll();
#endif
         ras.add_path(tr);
         agg::render_scanlines(ras, sl, ren_solid);
         //ras.add_path(fill);
         //ren_solid.color(agg::rgba8(0, 0, 0));
         //agg::render_scanlines(ras, sl, ren_solid);
         //ras.add_path(stroke);
         //ren_solid.color(agg::rgba8(255, 255, 255));
         //agg::render_scanlines(ras, sl, ren_solid);

#ifdef WIN32_PROFILE
         SuspendCAPAll();
#endif
         
         dbg_time_end(DBG_TIME_TEXT_ONE_RAS);
         
         // increment pen position
         x += glyph->advance_x;
         y += glyph->advance_y;
         dbg_time_end(DBG_TIME_TEXT_ONE_LETTER);
      }
      ++p;
   }

#ifdef USE_FRIBIDI
   free(bidi_text);
#endif

   dbg_time_end(DBG_TIME_TEXT_FULL);
}

void roadmap_canvas_agg_configure (unsigned char *buf, int width, int height, int stride) {

   agg_rbuf.attach(buf, width, height, stride);
   
   agg_renb.attach(agg_pixf);
   agg_renb.reset_clipping(true);
   ras.clip_box(0, 0, agg_renb.width(), agg_renb.height());

   agg::glyph_rendering gren = gren = agg::glyph_ren_outline; 

   roadmap_config_declare
       ("preferences", &RoadMapConfigFont, "font.ttf");

   char font_file[255];
   
   snprintf(font_file, sizeof(font_file), "%s/%s", roadmap_path_user(),
      roadmap_config_get (&RoadMapConfigFont));

   if (!RoadMapCanvasFontLoaded) {

      if(m_feng.load_font(font_file, 0, gren)) {
         m_feng.hinting(true);
         m_feng.height(15);
         m_feng.width(15);
         m_feng.flip_y(true);

         RoadMapCanvasFontLoaded = 1;
      } else {
         RoadMapCanvasFontLoaded = -1;
         char message[300];
         snprintf(message, sizeof(message), "Can't load font: %s\n", font_file);
         roadmap_messagebox("Error", message);
      }
   }
}


RoadMapImage roadmap_canvas_load_image (const char *path,
                                        const char* file_name) {

   return roadmap_canvas_agg_load_image (path, file_name);
}


void roadmap_canvas_draw_image (RoadMapImage image, RoadMapGuiPoint *pos,
                                int opacity) {

   if ((opacity <= 0) || (opacity >= 255)) {
      opacity = 255;
   }

   agg_renb.blend_from(image->pixfmt, 0, pos->x, pos->y, opacity);
}

[Roadmap-commit] roadmap_editor/src/editor editor_screen.c,1.8,1.9

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15030

Modified Files:
	editor_screen.c 
Log Message:
Add screen objects support.

Index: editor_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editor_screen.c	23 Apr 2006 14:43:51 -0000	1.8
--- editor_screen.c	29 Apr 2006 10:57:03 -0000	1.9
***************
*** 33,36 ****
--- 33,37 ----
  #include "roadmap_canvas.h"
  #include "roadmap_screen.h"
+ #include "roadmap_screen_obj.h"
  #include "roadmap_trip.h"
  #include "roadmap_display.h"
***************
*** 220,224 ****
     int i;
      
!    roadmap_math_to_position (point, &position);
     
     if (roadmap_navigate_retrieve_line
--- 221,229 ----
     int i;
      
!    if (roadmap_screen_obj_click (point)) {
!       return;
!    }
! 
!    roadmap_math_to_position (point, &position, 1);
     
     if (roadmap_navigate_retrieve_line

[Roadmap-commit] roadmap_editor/src/fribidi fribidi.h,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/fribidi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13930

Modified Files:
	fribidi.h 
Log Message:
Fix win32 fribidi inclusion.

Index: fribidi.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/fribidi/fribidi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fribidi.h	23 Apr 2006 13:27:11 -0000	1.2
--- fribidi.h	29 Apr 2006 10:55:40 -0000	1.3
***************
*** 25,29 ****
  #define FRIBIDI_H
  
! #ifndef WIN32
  #error This is the win32 include file. It will not work on Unix.
  #endif
--- 25,29 ----
  #define FRIBIDI_H
  
! #ifndef _WIN32
  #error This is the win32 include file. It will not work on Unix.
  #endif

[Roadmap-commit] roadmap_editor/src/gtk2 Makefile,1.5,1.6 roadmap_canvas_agg.cpp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/gtk2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12681

Modified Files:
	Makefile roadmap_canvas_agg.cpp 
Log Message:
Update agg gtk2 specific implementation.

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	23 Apr 2006 13:28:39 -0000	1.5
--- Makefile	29 Apr 2006 10:54:10 -0000	1.6
***************
*** 17,21 ****
  WARNFLAGS = -W -Wall -Wno-unused-parameter
  
! RDMLIBS= ../libroadmap.a libgtkroadmap.a ../libguiroadmap.a ../unix/libosroadmap.a ../libroadmap.a libgtkroadmap.a
  
  
--- 17,21 ----
  WARNFLAGS = -W -Wall -Wno-unused-parameter
  
! RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a ../libroadmap.a libgtkroadmap.a
  
  
***************
*** 48,52 ****
  
  
! CFLAGS = $(STDCFLAGS) $(GPECFLAGS) $(GUICFLAGS) -I.. -I/usr/local/include -DNDEBUG
  LIBS = -L/usr/local/lib $(RDMLIBS) $(GPELDFLAGS) $(GUILDFLAGS) -lm -L ../dglib -ldgl -lagg -lfreetype
  
--- 48,52 ----
  
  
! CFLAGS = $(STDCFLAGS) $(GPECFLAGS) $(GUICFLAGS) -I.. -I/usr/local/include -DNDEBUG -w
  LIBS = -L/usr/local/lib $(RDMLIBS) $(GPELDFLAGS) $(GUILDFLAGS) -lm -L ../dglib -ldgl -lagg -lfreetype
  
***************
*** 64,68 ****
            roadmap_fileselection.c 
  
! RMLIBOBJS=$(RMLIBSRCS:.c=.o) roadmap_canvas_agg.o ../agg23/font_freetype/agg_font_freetype.o
  
  RUNTIME=gtkroadgps gtkroadmap
--- 64,68 ----
            roadmap_fileselection.c 
  
! RMLIBOBJS=$(RMLIBSRCS:.c=.o) roadmap_canvas_agg.o ../agg23/roadmap_canvas.o ../agg23/font_freetype/agg_font_freetype.o
  
  RUNTIME=gtkroadgps gtkroadmap

Index: roadmap_canvas_agg.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_canvas_agg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_canvas_agg.cpp	23 Apr 2006 13:28:39 -0000	1.1
--- roadmap_canvas_agg.cpp	29 Apr 2006 10:54:10 -0000	1.2
***************
*** 35,38 ****
--- 35,40 ----
  #include <agg_curves.h>
  #include <agg_conv_stroke.h>
+ #include "util/agg_color_conv_rgb8.h"
+ #include "util/agg_color_conv_rgb16.h"
  #include <agg_conv_contour.h>
  #include <agg_conv_transform.h>
***************
*** 41,50 ****
  #include <agg_rasterizer_outline.h>
  #include <agg_renderer_primitives.h>
- #include <agg_ellipse.h>
  #include <agg_renderer_scanline.h>
  #include <agg_scanline_p.h>
  #include <agg_renderer_outline_aa.h>
  #include <agg_pixfmt_rgb_packed.h>
- #include <agg_path_storage.h>
  
  #include <agg_font_freetype.h>
--- 43,51 ----
  #include <agg_rasterizer_outline.h>
  #include <agg_renderer_primitives.h>
  #include <agg_renderer_scanline.h>
  #include <agg_scanline_p.h>
  #include <agg_renderer_outline_aa.h>
+ #include <agg_pixfmt_rgb.h>
  #include <agg_pixfmt_rgb_packed.h>
  
  #include <agg_font_freetype.h>
***************
*** 57,65 ****
  extern "C" {
  #include "roadmap.h"
- #include "roadmap_types.h"
- #include "roadmap_gui.h"
  #include "roadmap_config.h"
  #include "roadmap_messagebox.h"
- #include "roadmap_screen.h"
  #include "roadmap_path.h"
  
--- 58,63 ----
***************
*** 68,73 ****
  }
  
! #define ROADMAP_CURSOR_SIZE           10
! #define ROADMAP_CANVAS_POINT_BLOCK  1024
  
  #define GetRValue(x) x.red
--- 66,70 ----
  }
  
! #include "roadmap_canvas_agg.h"
  
  #define GetRValue(x) x.red
***************
*** 75,464 ****
  #define GetBValue(x) x.blue
  
- typedef agg::pixfmt_rgb565 pixfmt;
- typedef agg::renderer_base<pixfmt> renbase_type;
- typedef agg::renderer_primitives<renbase_type> renderer_pr;
- typedef agg::font_engine_freetype_int32 font_engine_type;
- typedef agg::font_cache_manager<font_engine_type> font_manager_type;
- 
- static agg::rendering_buffer rbuf;
- 
- static pixfmt pixf(rbuf);
- static agg::renderer_base<pixfmt> renb;
- 
- static agg::line_profile_aa profile(2, agg::gamma_none());
- 
- static agg::renderer_outline_aa<renbase_type> reno(renb, profile);
- static agg::rasterizer_outline_aa< agg::renderer_outline_aa<renbase_type> >  raso(reno);
- 
- static agg::rasterizer_scanline_aa<> ras;
- static agg::scanline_p8 sl;
- static agg::renderer_scanline_aa_solid<agg::renderer_base<pixfmt> > ren_solid(renb);
- 
- static font_engine_type             m_feng;
- static font_manager_type            m_fman(m_feng);
- 
- static RoadMapConfigDescriptor RoadMapConfigFont =
-                         ROADMAP_CONFIG_ITEM("Labels", "FontName");
- 
- 
- struct roadmap_canvas_pen {
- 
-    struct roadmap_canvas_pen *next;
- 
-    char  *name;
-    GdkGC *gc;
-    GdkColor color;
- 	int thickness;
- };
- 
- 
- static struct roadmap_canvas_pen *RoadMapPenList = NULL;
- 
  static GtkWidget  *RoadMapDrawingArea;
  static GdkImage   *RoadMapDrawingBuffer;
- static RoadMapPen	CurrentPen;
- 
- static int        RoadMapCanvasFontLoaded = 0;
- 
- 
- /* The canvas callbacks: all callbacks are initialized to do-nothing
-  * functions, so that we don't care checking if one has been setup.
-  */
- static void roadmap_canvas_ignore_mouse (RoadMapGuiPoint *point) {}
- 
- static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed =
-                                      roadmap_canvas_ignore_mouse;
- 
- static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonReleased =
-                                      roadmap_canvas_ignore_mouse;
- 
- static RoadMapCanvasMouseHandler RoadMapCanvasMouseMoved =
-                                      roadmap_canvas_ignore_mouse;
- 
- 
- static void roadmap_canvas_ignore_configure (void) {}
- 
- static RoadMapCanvasConfigureHandler RoadMapCanvasConfigure =
-                                      roadmap_canvas_ignore_configure;
- 
- 
- void roadmap_canvas_get_text_extents 
-         (const char *text, int *width, int *ascent, int *descent) {
- 
-    *ascent = 0;
-    *descent = 0;
- 
-    wchar_t wstr[255];
-    int length = mbstowcs(wstr, text, 254);
- 
-    if (length <=0) {
-       *width = 0;
-       return;
-    }
- 
-    wstr[length] = 0;
- 
-    double x  = 0;
-    double y  = 0;
-    const wchar_t* p = wstr;
-    
-    while(*p) {
-       const agg::glyph_cache* glyph = m_fman.glyph(*p);
- 
-       if(glyph) {
-          x += glyph->advance_x;
-          y += glyph->advance_y;
-          //if (glyph->bounds.y2 < *ascent) *ascent=glyph->bounds.y2;
-          if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1;
-       }
-       ++p;
-    }
- 
-    *width = (int)x;
- }
- 
- 
- void roadmap_canvas_select_pen (RoadMapPen pen) {
- 
-    if (!CurrentPen || (pen->thickness != CurrentPen->thickness)) {
-       profile.width(pen->thickness);
-    }
-    CurrentPen = pen;
- 
-    reno.color(agg::rgba8(GetRValue(pen->color), GetGValue(pen->color),
-             GetBValue(pen->color)));
- 
- }
- 
- 
- RoadMapPen roadmap_canvas_create_pen (const char *name) {
- 
-    struct roadmap_canvas_pen *pen;
- 
-    for (pen = RoadMapPenList; pen != NULL; pen = pen->next) {
-       if (strcmp(pen->name, name) == 0) break;
-    }
- 
-    if (pen == NULL) {
- 
-       /* This is a new pen: create it. */
- 
-       pen = (struct roadmap_canvas_pen *)
-                 malloc (sizeof(struct roadmap_canvas_pen));
-       roadmap_check_allocated(pen);
- 
-       pen->name = strdup (name);
-       pen->next = RoadMapPenList;
- 		pen->thickness = 1;
- 
-       RoadMapPenList = pen;
-    }
- 
-    roadmap_canvas_select_pen (pen);
- 
-    return pen;
- }
- 
- 
- void roadmap_canvas_set_foreground (const char *color) {
- 
-    GdkColor *native_color;
- 
- 
-    native_color = (GdkColor *) g_malloc (sizeof(GdkColor));
- 
-    gdk_color_parse (color, native_color);
-    gdk_color_alloc (gdk_colormap_get_system(), native_color);
- 
- 	CurrentPen->color = *native_color;
- 	roadmap_canvas_select_pen(CurrentPen);
- }
- 
- 
- void roadmap_canvas_set_thickness  (int thickness) {
- 
-    if (CurrentPen && (CurrentPen->thickness != thickness)) {
- 		CurrentPen->thickness = thickness;
-       profile.width(thickness);
- 	}
- }
  
  
! void roadmap_canvas_erase (void) {
  
!    renb.clear(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
  }
  
  
! void roadmap_canvas_draw_string (RoadMapGuiPoint *position,
!                                  int corner,
!                                  const char *text) {
! 
!    int x;
!    int y;
!    int text_width;
!    int text_ascent;
!    int text_descent;
!    int text_height;
! 
!    roadmap_canvas_get_text_extents 
!         (text, &text_width, &text_ascent, &text_descent);
! 
!    text_height = text_ascent + text_descent;
! 
!    switch (corner) {
! 
!    case ROADMAP_CANVAS_TOPLEFT:
!       y = position->y;
!       x = position->x;
!       break;
! 
!    case ROADMAP_CANVAS_TOPRIGHT:
!       y = position->y;
!       x = position->x - text_width;
!       break;
! 
!    case ROADMAP_CANVAS_BOTTOMRIGHT:
!       y = position->y - text_height;
!       x = position->x - text_width;
!       break;
! 
!    case ROADMAP_CANVAS_BOTTOMLEFT:
!       y = position->y - text_height;
!       x = position->x;
!       break;
! 
!    case ROADMAP_CANVAS_CENTER:
!       y = position->y - (text_height / 2);
!       x = position->x - (text_width / 2);
!       break;
  
!    default:
!       return;
!    }
  
!    RoadMapGuiPoint start = {x, y+text_height};
!    roadmap_canvas_draw_string_angle (&start, position, 0, text);
  }
  
  
! void roadmap_canvas_draw_multiple_points (int count, RoadMapGuiPoint *points) {
! 
!    int i;
  
!    for (i=0; i<count; i++) {
  
!       if (points[i].x < 0) continue;
!       else if (points[i].x >= roadmap_canvas_width()) continue;
!       else if (points[i].y < 0) continue;
!       else if (points[i].y >= roadmap_canvas_height()) continue;
  
!       pixf.copy_pixel(points[i].x, points[i].y,
!                       agg::rgba8(GetRValue(CurrentPen->color),
!                         GetGValue(CurrentPen->color),
!                         GetBValue(CurrentPen->color)));
     }
- }
- 
- void roadmap_canvas_draw_multiple_lines (int count, int *lines,
-       RoadMapGuiPoint *points) {
-    int i;
-    int count_of_points;
- 
-    raso.round_cap(true);
-    raso.accurate_join(true);
- 
-    agg::path_storage path;
- 
-    for (i = 0; i < count; ++i) {
- 
-       int first = 1;
- 
-       count_of_points = *lines;
- 
-       if (count_of_points < 2) continue;
- 
-       for (int j=0; j<count_of_points; j++) {
- 
-          if (first) {
-             first = 0;
-             path.move_to(points->x, points->y);            
-          } else {
-             path.line_to(points->x, points->y);
-          }
- 
-          points++;
-       }
- 
-       if (roadmap_screen_is_dragging()) {
-          renderer_pr ren_pr(renb);
-          agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
-          ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
-          ras_line.add_path(path);
- 
-       } else {
- 
-          raso.add_path(path);
-       }
- 
-       path.remove_all ();
  
!       lines += 1;
     }
- }
- 
- void roadmap_canvas_draw_multiple_polygons
-          (int count, int *polygons, RoadMapGuiPoint *points, int filled) {
- 
-    int i;
-    int count_of_points;
     
!    agg::path_storage path;
!    
!    for (i = 0; i < count; ++i) {
!       
!       count_of_points = *polygons;
!       
!       int first = 1;
!       
!       for (int j=0; j<count_of_points; j++) {
!          
!          if (first) {
!             first = 0;
!             path.move_to(points->x, points->y);            
!          } else {
!             path.line_to(points->x, points->y);
!          }
!          points++;
!       }
!       
!       path.close_polygon();
!       
!       if (filled) {
!          
!          ras.reset();
!          ras.add_path(path);
!          ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
!          agg::render_scanlines( ras, sl, ren_solid);
!          
!       } else if (roadmap_screen_is_dragging()) {
!          renderer_pr ren_pr(renb);
!          agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
!          ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
!          ras_line.add_path(path);
!          
!       } else {
!          
!          raso.add_path(path);
!       }
!       
!       path.remove_all ();
!       
!       polygons += 1;
!    }
!             
! }
  
  
! void roadmap_canvas_draw_multiple_circles
!         (int count, RoadMapGuiPoint *centers, int *radius, int filled) {
  
!    int i;
!    
!    agg::path_storage path;
!    
!    for (i = 0; i < count; ++i) {
!       
!       int r = radius[i];
!       
!       int x = centers[i].x;
!       int y = centers[i].y;
!       
!       ras.reset ();
  
!       
!       agg::ellipse e( x, y, r, r);
!       path.add_path(e);
!       
!       if (filled) {
!          
!          ras.reset();
!          ras.add_path(path);
!          ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
!          agg::render_scanlines( ras, sl, ren_solid);
!          
!       } else if (roadmap_screen_is_dragging()) {
!          renderer_pr ren_pr(renb);
!          agg::rasterizer_outline<renderer_pr> ras_line(ren_pr);
!          ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color)));
!          ras_line.add_path(path);
!          
!       } else {
!          
!          raso.add_path(path);
!       }
!       
!       path.remove_all ();
!    }
  }
  
--- 72,141 ----
  #define GetBValue(x) x.blue
  
  static GtkWidget  *RoadMapDrawingArea;
  static GdkImage   *RoadMapDrawingBuffer;
  
+ int roadmap_canvas_agg_to_wchar (const char *text, wchar_t *output, int size) {
  
!    int length = mbstowcs(output, text, size - 1);
!    output[length] = 0;
  
!    return length;
  }
+                                      
  
+ agg::rgba8 roadmap_canvas_agg_parse_color (const char *color) {
  
!    GdkColor native_color;
  
!    gdk_color_parse (color, &native_color);
!    gdk_color_alloc (gdk_colormap_get_system(), &native_color);
  
!    return agg::rgba8(GetRValue(native_color), GetGValue(native_color),
!             GetBValue(native_color));
  }
  
  
! RoadMapImage roadmap_canvas_agg_load_image (const char *path,
!                                             const char *file_name) {
  
!    char *full_name = roadmap_path_join (path, file_name);
  
!    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(full_name, NULL);
!    free (full_name);
  
!    if (pixbuf == NULL) {
!       return NULL;
     }
  
!    if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) {
!       return NULL;
     }
     
!    int n_channels = gdk_pixbuf_get_n_channels (pixbuf);
!    int bbs = gdk_pixbuf_get_bits_per_sample (pixbuf);
!    int width = gdk_pixbuf_get_width (pixbuf);
!    int height = gdk_pixbuf_get_height (pixbuf);
  
+    unsigned char *buf = (unsigned char *)malloc (width*height*3);
  
!    agg::rendering_buffer tmp_rbuf (gdk_pixbuf_get_pixels (pixbuf),
!                                   width, height,
!                                   gdk_pixbuf_get_rowstride (pixbuf));
  
!    agg::pixfmt_rgb24 tmp_pixfmt (tmp_rbuf);
!    agg::renderer_base<agg::pixfmt_rgb24> tmp_ren(tmp_pixfmt);
  
!    RoadMapImage image =  new roadmap_canvas_image();
!    
!    /*
!    int stride = ((width * 2 + 3) >> 2) << 2;
!    image->rbuf.attach (buf, width, height, stride);
!    image->ren.attach (image->pixfmt);
!    agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_rgb24_to_rgb565());
!    */
!    image->rbuf.attach (gdk_pixbuf_get_pixels (pixbuf),
!                                   width, height,
!                                   gdk_pixbuf_get_rowstride (pixbuf));
!    return image;
  }
  
***************
*** 490,524 ****
     }
  
!    rbuf.attach((unsigned char*)RoadMapDrawingBuffer->mem, RoadMapDrawingBuffer->width, RoadMapDrawingBuffer->height, RoadMapDrawingBuffer->bpl);
!    
!    renb.attach(pixf);
!    ras.clip_box(0, 0, renb.width(), renb.height());
! 
!    agg::glyph_rendering gren = gren = agg::glyph_ren_outline; 
! 
!    roadmap_config_declare
!        ("preferences", &RoadMapConfigFont, "font.ttf");
! 
!    char font_file[255];
!    
!    snprintf(font_file, sizeof(font_file), "%s/%s", roadmap_path_user(),
!       roadmap_config_get (&RoadMapConfigFont));
! 
!    if (!RoadMapCanvasFontLoaded) {
! 
!       if(m_feng.load_font(font_file, 0, gren)) {
!          m_feng.hinting(true);
!          m_feng.height(15);
!          m_feng.width(15);
!          m_feng.flip_y(true);
! 
!          RoadMapCanvasFontLoaded = 1;
!       } else {
!          RoadMapCanvasFontLoaded = -1;
!          char message[300];
!          snprintf(message, sizeof(message), "Can't load font: %s\n", font_file);
!          roadmap_messagebox("Error", message);
!       }
!    }
  
     (*RoadMapCanvasConfigure) ();
--- 167,174 ----
     }
  
!    roadmap_canvas_agg_configure ((unsigned char*)RoadMapDrawingBuffer->mem,
!                                  RoadMapDrawingBuffer->width,
!                                  RoadMapDrawingBuffer->height,
!                                  RoadMapDrawingBuffer->bpl);
  
     (*RoadMapCanvasConfigure) ();
***************
*** 528,538 ****
  
  
- void roadmap_canvas_register_configure_handler
-                     (RoadMapCanvasConfigureHandler handler) {
- 
-    RoadMapCanvasConfigure = handler;
- }
- 
- 
  static gint roadmap_canvas_expose (GtkWidget *widget, GdkEventExpose *event) {
  
--- 178,181 ----
***************
*** 566,607 ****
  
  
- void roadmap_canvas_register_button_pressed_handler
-                     (RoadMapCanvasMouseHandler handler) {
- 
-    RoadMapCanvasMouseButtonPressed = handler;
- }
- 
- 
- void roadmap_canvas_register_button_released_handler
-                     (RoadMapCanvasMouseHandler handler) {
-        
-    RoadMapCanvasMouseButtonReleased = handler;
- }
- 
- 
- void roadmap_canvas_register_mouse_move_handler
-                     (RoadMapCanvasMouseHandler handler) {
- 
-    RoadMapCanvasMouseMoved = handler;
- }
- 
- 
- int roadmap_canvas_width (void) {
- 
-    if (RoadMapDrawingArea == NULL) {
-       return 0;
-    }
-    return RoadMapDrawingArea->allocation.width;
- }
- 
- int roadmap_canvas_height (void) {
- 
-    if (RoadMapDrawingArea == NULL) {
-       return 0;
-    }
-    return RoadMapDrawingArea->allocation.height;
- }
- 
- 
  void roadmap_canvas_refresh (void) {
  
--- 209,212 ----
***************
*** 656,805 ****
                       (gpointer)3);
  
-    //RoadMapGc = RoadMapDrawingArea->style->black_gc;
- 
     return RoadMapDrawingArea;
  }
  
  
- void roadmap_canvas_save_screenshot (const char* filename) {
- 
- #if 0
-    gint width,height;
-    GdkColormap *colormap = gdk_colormap_get_system();
-    GdkPixbuf *pixbuf;
-    GError *error = NULL;
- 
- 
-    gdk_drawable_get_size(RoadMapDrawingBuffer, &width, &height);
- 
-    pixbuf = gdk_pixbuf_get_from_drawable(NULL, // Create a new pixbuf.
-                                          RoadMapDrawingBuffer,
-                                          colormap,
-                                          0,0,         // source
-                                          0,0,         // destination
-                                          width, height);  // size
- 
- 
-    if (gdk_pixbuf_save(pixbuf, filename, "png", &error, NULL) == FALSE) {
- 
-       roadmap_log(ROADMAP_ERROR, "Failed to save image %s\n",filename);
-    }
- 
-    gdk_pixbuf_unref(pixbuf);
- #endif   
- }
- 
- /*
- ** Use FRIBIDI to encode the string.
- ** The return value must be freed by the caller.
- */
- 
- #ifdef USE_FRIBIDI
- static wchar_t* bidi_string(wchar_t *logical) {
-    
-    FriBidiCharType base = FRIBIDI_TYPE_ON;
-    size_t len;
-    
-    len = wcslen(logical);
-    
-    FriBidiChar *visual;
-    
-    FriBidiStrIndex *ltov, *vtol;
-    FriBidiLevel *levels;
-    FriBidiStrIndex new_len;
-    fribidi_boolean log2vis;
-    
-    visual = (FriBidiChar *) malloc (sizeof (FriBidiChar) * (len + 1));
-    ltov = NULL;
-    vtol = NULL;
-    levels = NULL;
-    
-    /* Create a bidi string. */
-    log2vis = fribidi_log2vis ((FriBidiChar *)logical, len, &base,
-       /* output */
-       visual, ltov, vtol, levels);
-    
-    if (!log2vis) {
-       //msSetError(MS_IDENTERR, "Failed to create bidi string.", 
-       //"msGetFriBidiEncodedString()");
-       return NULL;
-    }
-    
-    new_len = len;
-    
-    return (wchar_t *)visual;
-    
- }
- #endif
- 
- void roadmap_canvas_draw_string_angle (RoadMapGuiPoint *position,
-                                        RoadMapGuiPoint *center,
-                                        int angle, const char *text)
- {
-    
-    if (roadmap_screen_is_dragging()) return;
-    if (RoadMapCanvasFontLoaded != 1) return;
-    
-    ren_solid.color(agg::rgba8(0, 0, 0));
-    
-    double x  = 0;
-    double y  = 0;
-    wchar_t wstr[255];
-    
-    //mbstate_t ps;
-    //int length = mbrtowc(wstr, text, 10, mbstate_t *ps);
-    int length = mbstowcs(wstr, text, 254);
- 
-    if (length <=0) return;
-    wstr[length] = 0;
- 
- #ifdef USE_FRIBIDI
-    wchar_t *bidi_text = bidi_string(wstr);
-    const wchar_t* p = bidi_text;
- #else   
-    const wchar_t* p = wstr;
- #endif
-    
-    while(*p) {
-       const agg::glyph_cache* glyph = m_fman.glyph(*p);
- 
-       if(glyph) {
-          m_fman.init_embedded_adaptors(glyph, x, y);
-          
-          //agg::conv_curve<font_manager_type::path_adaptor_type> stroke(m_fman.path_adaptor());
-          
-          agg::trans_affine mtx;
-          if (abs(angle) > 5) {
-             mtx *= agg::trans_affine_rotation(agg::deg2rad(angle));
-          }
-          mtx *= agg::trans_affine_translation(position->x, position->y);
-          
-          agg::conv_transform<font_manager_type::path_adaptor_type> tr(m_fman.path_adaptor(), mtx);
- 
-          agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > fill(tr);
- 
-          //agg::conv_stroke<
-             //agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > > 
-          //stroke(fill);
- 
-          agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> >
-          stroke(tr);
- 
-          ras.add_path(tr);
-          //ren_solid.color(agg::rgba8(0, 0, 0));
-          agg::render_scanlines(ras, sl, ren_solid);
-          //ras.add_path(stroke);
-          //ren_solid.color(agg::rgba8(255, 255, 255));
-          //agg::render_scanlines(ras, sl, ren_solid);
- 
-          // increment pen position
-          x += glyph->advance_x;
-          y += glyph->advance_y;
-       }
-       ++p;
-    }
- 
- #ifdef USE_FRIBIDI
-    free(bidi_text);
- #endif
- }
--- 261,266 ----

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libguiroadmap libguiroadmap.vcp,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11707/libguiroadmap

Modified Files:
	libguiroadmap.vcp 
Log Message:
Update evc4 project files.

Index: libguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** libguiroadmap.vcp	23 Apr 2006 13:32:25 -0000	1.3
--- libguiroadmap.vcp	29 Apr 2006 10:53:08 -0000	1.4
***************
*** 51,63 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
- # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
--- 51,63 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+ # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
***************
*** 77,89 ****
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
- # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
- LIB32=link.exe -lib
- # ADD BASE LIB32 /nologo
- # ADD LIB32 /nologo
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
--- 77,89 ----
  # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
  # PROP Target_Dir ""
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
+ LIB32=link.exe -lib
+ # ADD BASE LIB32 /nologo
+ # ADD LIB32 /nologo
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+ # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
  
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
***************
*** 105,109 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 105,109 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../wince_os/" /I "../../" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 131,135 ****
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 131,135 ----
  CPP=cl.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../wince_os/" /I "../../" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /Gs8192 /GF /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 157,161 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 157,161 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /M$(CECrtMTDebug) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 183,187 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 183,187 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "WIN32_PROFILE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 1286,1289 ****
--- 1286,1290 ----
  	"..\..\..\roadmap_dialog.h"\
  	"..\..\..\roadmap_download.h"\
+ 	"..\..\..\roadmap_factory.h"\
  	"..\..\..\roadmap_file.h"\
  	"..\..\..\roadmap_gui.h"\
***************
*** 2771,2774 ****
--- 2772,2776 ----
  	"..\..\..\roadmap_polygon.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_shape.h"\
***************
*** 2812,2815 ****
--- 2814,2818 ----
  	"..\..\..\roadmap_polygon.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_shape.h"\
***************
*** 2871,2874 ****
--- 2874,3017 ----
  # Begin Source File
  
+ SOURCE=..\..\..\roadmap_screen_obj.c
+ 
+ !IF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Release"
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
+ 
+ DEP_CPP_ROADMAP_SC=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_sprite.h"\
+ 	"..\..\..\roadmap_start.h"\
+ 	"..\..\..\roadmap_state.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug"
+ 
+ DEP_CPP_ROADMAP_SC=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_sprite.h"\
+ 	"..\..\..\roadmap_start.h"\
+ 	"..\..\..\roadmap_state.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug"
+ 
+ DEP_CPP_ROADMAP_SC=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_sprite.h"\
+ 	"..\..\..\roadmap_start.h"\
+ 	"..\..\..\roadmap_state.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release"
+ 
+ DEP_CPP_ROADMAP_SC=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler"
+ 
+ DEP_CPP_ROADMAP_SC=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_sprite.h"\
+ 	"..\..\..\roadmap_start.h"\
+ 	"..\..\..\roadmap_state.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\..\roadmap_sprite.c
  
***************
*** 3207,3210 ****
--- 3350,3354 ----
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
***************
*** 3263,3266 ****
--- 3407,3411 ----
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
***************
*** 3492,3495 ****
--- 3637,3641 ----
  	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_sprite.h"\
+ 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_sunrise.h"\
  	"..\..\..\roadmap_time.h"\

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libroadmap libroadmap.vcp,1.7,1.8

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11707/libroadmap

Modified Files:
	libroadmap.vcp 
Log Message:
Update evc4 project files.

Index: libroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** libroadmap.vcp	23 Apr 2006 13:32:25 -0000	1.7
--- libroadmap.vcp	29 Apr 2006 10:53:08 -0000	1.8
***************
*** 1910,1913 ****
--- 1910,1914 ----
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_screen_obj.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_shape.h"\
***************
*** 1915,1918 ****
--- 1916,1920 ----
  	"..\..\..\roadmap_square.h"\
  	"..\..\..\roadmap_street.h"\
+ 	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_trip.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 4787,4790 ****
--- 4789,4793 ----
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_state.h"\
  	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 6927,6936 ****
  # Begin Source File
  
! SOURCE=..\..\..\roadmap_street.c
  
  !IF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release"
  
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_db_range.h"\
--- 6930,7040 ----
  # Begin Source File
  
! SOURCE=..\..\..\roadmap_state.c
  
  !IF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release"
  
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug"
+ 
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Release"
+ 
+ DEP_CPP_ROADMAP_ST=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_states.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug"
+ 
+ DEP_CPP_ROADMAP_ST=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_states.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug"
+ 
+ DEP_CPP_ROADMAP_ST=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_states.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
+ 
+ DEP_CPP_ROADMAP_ST=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_states.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler"
+ 
  DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gps.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
+ 	"..\..\..\roadmap_states.h"\
+ 	"..\..\..\roadmap_string.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
+ 	
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\..\roadmap_street.c
+ 
+ !IF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release"
+ 
+ DEP_CPP_ROADMAP_STR=\
+ 	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_db_range.h"\
***************
*** 6951,6955 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
--- 7055,7059 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
***************
*** 6971,6975 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
--- 7075,7079 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
***************
*** 6991,6995 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
--- 7095,7099 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_db.h"\
***************
*** 7011,7015 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 7115,7119 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 7033,7037 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 7137,7141 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 7055,7059 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_ST=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 7159,7163 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 7084,7088 ****
  !IF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7188,7192 ----
  !IF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7093,7097 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7197,7201 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7102,7106 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7206,7210 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7111,7115 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7215,7219 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7120,7124 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7224,7228 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7129,7133 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7233,7237 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
***************
*** 7138,7142 ****
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_STR=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\
--- 7242,7246 ----
  !ELSEIF  "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_STRI=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_string.h"\

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libwinceguiroadmap libwinceguiroadmap.vcp,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11707/libwinceguiroadmap

Modified Files:
	libwinceguiroadmap.vcp 
Log Message:
Update evc4 project files.

Index: libwinceguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** libwinceguiroadmap.vcp	23 Apr 2006 13:32:25 -0000	1.3
--- libwinceguiroadmap.vcp	29 Apr 2006 10:53:08 -0000	1.4
***************
*** 233,237 ****
  # Begin Source File
  
! SOURCE=..\..\roadmap_canvas.cpp
  
  !IF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Release"
--- 233,237 ----
  # Begin Source File
  
! SOURCE=..\..\roadmap_canvas_agg.cpp
  
  !IF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Release"
***************
*** 242,336 ****
  
  DEP_CPP_ROADM=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\colors.h"\
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"C:\Projects\agg23\include\agg_array.h"\
! 	"C:\Projects\agg23\include\agg_basics.h"\
! 	"C:\Projects\agg23\include\agg_clip_liang_barsky.h"\
! 	"C:\Projects\agg23\include\agg_color_rgba.h"\
! 	"C:\Projects\agg23\include\agg_config.h"\
! 	"C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"C:\Projects\agg23\include\agg_conv_stroke.h"\
! 	"C:\Projects\agg23\include\agg_curves.h"\
! 	"C:\Projects\agg23\include\agg_gamma_functions.h"\
! 	"C:\Projects\agg23\include\agg_math.h"\
! 	"C:\Projects\agg23\include\agg_math_stroke.h"\
! 	"C:\Projects\agg23\include\agg_path_storage.h"\
! 	"C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_outline.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"C:\Projects\agg23\include\agg_render_scanlines.h"\
! 	"C:\Projects\agg23\include\agg_renderer_base.h"\
! 	"C:\Projects\agg23\include\agg_renderer_scanline.h"\
! 	"C:\Projects\agg23\include\agg_rendering_buffer.h"\
! 	"C:\Projects\agg23\include\agg_scanline_bin.h"\
! 	"C:\Projects\agg23\include\agg_scanline_p.h"\
! 	"C:\Projects\agg23\include\agg_vcgen_stroke.h"\
! 	"C:\Projects\agg23\include\agg_vertex_sequence.h"\
  	
! # ADD CPP /I "C:\Projects\agg23\include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug"
  
  DEP_CPP_ROADM=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\colors.h"\
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"C:\Projects\agg23\include\agg_array.h"\
! 	"C:\Projects\agg23\include\agg_basics.h"\
! 	"C:\Projects\agg23\include\agg_clip_liang_barsky.h"\
! 	"C:\Projects\agg23\include\agg_color_rgba.h"\
! 	"C:\Projects\agg23\include\agg_config.h"\
! 	"C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"C:\Projects\agg23\include\agg_conv_stroke.h"\
! 	"C:\Projects\agg23\include\agg_curves.h"\
! 	"C:\Projects\agg23\include\agg_gamma_functions.h"\
! 	"C:\Projects\agg23\include\agg_math.h"\
! 	"C:\Projects\agg23\include\agg_math_stroke.h"\
! 	"C:\Projects\agg23\include\agg_path_storage.h"\
! 	"C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_outline.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"C:\Projects\agg23\include\agg_render_scanlines.h"\
! 	"C:\Projects\agg23\include\agg_renderer_base.h"\
! 	"C:\Projects\agg23\include\agg_renderer_scanline.h"\
! 	"C:\Projects\agg23\include\agg_rendering_buffer.h"\
! 	"C:\Projects\agg23\include\agg_scanline_bin.h"\
! 	"C:\Projects\agg23\include\agg_scanline_p.h"\
! 	"C:\Projects\agg23\include\agg_vcgen_stroke.h"\
! 	"C:\Projects\agg23\include\agg_vertex_sequence.h"\
  	
! # ADD CPP /I "C:\Projects\agg23\include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\agg23\font_freetype\agg_font_freetype.h"\
! 	"..\..\..\freetype\include\freetype\config\ftheader.h"\
! 	"..\..\..\freetype\include\ft2build.h"\
! 	"..\..\..\fribidi\fribidi.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.i"\
! 	"..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1255.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1256.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_utf8.h"\
! 	"..\..\..\fribidi\fribidi_config.h"\
! 	"..\..\..\fribidi\fribidi_types.h"\
! 	"..\..\..\fribidi\fribidi_types.i"\
! 	"..\..\..\fribidi\fribidi_unicode.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
--- 242,393 ----
  
  DEP_CPP_ROADM=\
+ 	"..\..\..\agg23\include\agg_array.h"\
+ 	"..\..\..\agg23\include\agg_basics.h"\
+ 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
+ 	"..\..\..\agg23\include\agg_color_rgba.h"\
+ 	"..\..\..\agg23\include\agg_config.h"\
+ 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
+ 	"..\..\..\agg23\include\agg_conv_contour.h"\
+ 	"..\..\..\agg23\include\agg_conv_stroke.h"\
+ 	"..\..\..\agg23\include\agg_conv_transform.h"\
+ 	"..\..\..\agg23\include\agg_curves.h"\
+ 	"..\..\..\agg23\include\agg_dda_line.h"\
+ 	"..\..\..\agg23\include\agg_ellipse.h"\
+ 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
+ 	"..\..\..\agg23\include\agg_gamma_functions.h"\
+ 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
+ 	"..\..\..\agg23\include\agg_math.h"\
+ 	"..\..\..\agg23\include\agg_math_stroke.h"\
+ 	"..\..\..\agg23\include\agg_path_storage.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
+ 	"..\..\..\agg23\include\agg_render_scanlines.h"\
+ 	"..\..\..\agg23\include\agg_renderer_base.h"\
+ 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
+ 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
+ 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
+ 	"..\..\..\agg23\include\agg_scanline_p.h"\
+ 	"..\..\..\agg23\include\agg_trans_affine.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
+ 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
+ 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
+ 	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\colors.h"\
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	
! # ADD CPP /I "../../../agg23/include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug"
  
  DEP_CPP_ROADM=\
+ 	"..\..\..\agg23\include\agg_array.h"\
+ 	"..\..\..\agg23\include\agg_basics.h"\
+ 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
+ 	"..\..\..\agg23\include\agg_color_rgba.h"\
+ 	"..\..\..\agg23\include\agg_config.h"\
+ 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
+ 	"..\..\..\agg23\include\agg_conv_contour.h"\
+ 	"..\..\..\agg23\include\agg_conv_stroke.h"\
+ 	"..\..\..\agg23\include\agg_conv_transform.h"\
+ 	"..\..\..\agg23\include\agg_curves.h"\
+ 	"..\..\..\agg23\include\agg_dda_line.h"\
+ 	"..\..\..\agg23\include\agg_ellipse.h"\
+ 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
+ 	"..\..\..\agg23\include\agg_gamma_functions.h"\
+ 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
+ 	"..\..\..\agg23\include\agg_math.h"\
+ 	"..\..\..\agg23\include\agg_math_stroke.h"\
+ 	"..\..\..\agg23\include\agg_path_storage.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
+ 	"..\..\..\agg23\include\agg_render_scanlines.h"\
+ 	"..\..\..\agg23\include\agg_renderer_base.h"\
+ 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
+ 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
+ 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
+ 	"..\..\..\agg23\include\agg_scanline_p.h"\
+ 	"..\..\..\agg23\include\agg_trans_affine.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
+ 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
+ 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
+ 	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\colors.h"\
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	
! # ADD CPP /I "../../../agg23/include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\agg23\include\agg_array.h"\
! 	"..\..\..\agg23\include\agg_basics.h"\
! 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
! 	"..\..\..\agg23\include\agg_color_rgba.h"\
! 	"..\..\..\agg23\include\agg_config.h"\
! 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"..\..\..\agg23\include\agg_conv_contour.h"\
! 	"..\..\..\agg23\include\agg_conv_stroke.h"\
! 	"..\..\..\agg23\include\agg_conv_transform.h"\
! 	"..\..\..\agg23\include\agg_curves.h"\
! 	"..\..\..\agg23\include\agg_dda_line.h"\
! 	"..\..\..\agg23\include\agg_ellipse.h"\
! 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
! 	"..\..\..\agg23\include\agg_gamma_functions.h"\
! 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
! 	"..\..\..\agg23\include\agg_math.h"\
! 	"..\..\..\agg23\include\agg_math_stroke.h"\
! 	"..\..\..\agg23\include\agg_path_storage.h"\
! 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
! 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"..\..\..\agg23\include\agg_render_scanlines.h"\
! 	"..\..\..\agg23\include\agg_renderer_base.h"\
! 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
! 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
! 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
! 	"..\..\..\agg23\include\agg_scanline_p.h"\
! 	"..\..\..\agg23\include\agg_trans_affine.h"\
! 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
! 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
! 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
! 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
***************
*** 344,413 ****
  	"..\..\roadmap_wincecanvas.h"\
  	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
- 	"C:\Projects\agg23\include\agg_array.h"\
- 	"C:\Projects\agg23\include\agg_basics.h"\
- 	"C:\Projects\agg23\include\agg_clip_liang_barsky.h"\
- 	"C:\Projects\agg23\include\agg_color_rgba.h"\
- 	"C:\Projects\agg23\include\agg_config.h"\
- 	"C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\
- 	"C:\Projects\agg23\include\agg_conv_contour.h"\
- 	"C:\Projects\agg23\include\agg_conv_curve.h"\
- 	"C:\Projects\agg23\include\agg_conv_stroke.h"\
- 	"C:\Projects\agg23\include\agg_conv_transform.h"\
- 	"C:\Projects\agg23\include\agg_curves.h"\
- 	"C:\Projects\agg23\include\agg_dda_line.h"\
- 	"C:\Projects\agg23\include\agg_ellipse.h"\
- 	"C:\Projects\agg23\include\agg_ellipse_bresenham.h"\
- 	"C:\Projects\agg23\include\agg_font_cache_manager.h"\
- 	"C:\Projects\agg23\include\agg_gamma_functions.h"\
- 	"C:\Projects\agg23\include\agg_line_aa_basics.h"\
- 	"C:\Projects\agg23\include\agg_math.h"\
- 	"C:\Projects\agg23\include\agg_math_stroke.h"\
- 	"C:\Projects\agg23\include\agg_path_storage.h"\
- 	"C:\Projects\agg23\include\agg_path_storage_integer.h"\
- 	"C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_outline.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\
- 	"C:\Projects\agg23\include\agg_render_scanlines.h"\
- 	"C:\Projects\agg23\include\agg_renderer_base.h"\
- 	"C:\Projects\agg23\include\agg_renderer_outline_aa.h"\
- 	"C:\Projects\agg23\include\agg_renderer_primitives.h"\
- 	"C:\Projects\agg23\include\agg_renderer_scanline.h"\
- 	"C:\Projects\agg23\include\agg_rendering_buffer.h"\
- 	"C:\Projects\agg23\include\agg_scanline_bin.h"\
- 	"C:\Projects\agg23\include\agg_scanline_p.h"\
- 	"C:\Projects\agg23\include\agg_scanline_storage_aa.h"\
- 	"C:\Projects\agg23\include\agg_scanline_storage_bin.h"\
- 	"C:\Projects\agg23\include\agg_scanline_u.h"\
- 	"C:\Projects\agg23\include\agg_trans_affine.h"\
- 	"C:\Projects\agg23\include\agg_vcgen_contour.h"\
- 	"C:\Projects\agg23\include\agg_vcgen_stroke.h"\
- 	"C:\Projects\agg23\include\agg_vertex_sequence.h"\
  	
! # ADD CPP /I "C:\Projects\agg23\include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Release"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\freetype\include\freetype\config\ftheader.h"\
! 	"..\..\..\freetype\include\ft2build.h"\
! 	"..\..\..\fribidi\fribidi.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.i"\
! 	"..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1255.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1256.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_utf8.h"\
! 	"..\..\..\fribidi\fribidi_config.h"\
! 	"..\..\..\fribidi\fribidi_types.h"\
! 	"..\..\..\fribidi\fribidi_types.i"\
! 	"..\..\..\fribidi\fribidi_unicode.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
--- 401,451 ----
  	"..\..\roadmap_wincecanvas.h"\
  	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	
! # ADD CPP /I "../../../agg23/include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Release"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\agg23\include\agg_array.h"\
! 	"..\..\..\agg23\include\agg_basics.h"\
! 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
! 	"..\..\..\agg23\include\agg_color_rgba.h"\
! 	"..\..\..\agg23\include\agg_config.h"\
! 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"..\..\..\agg23\include\agg_conv_contour.h"\
! 	"..\..\..\agg23\include\agg_conv_stroke.h"\
! 	"..\..\..\agg23\include\agg_conv_transform.h"\
! 	"..\..\..\agg23\include\agg_curves.h"\
! 	"..\..\..\agg23\include\agg_dda_line.h"\
! 	"..\..\..\agg23\include\agg_ellipse.h"\
! 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
! 	"..\..\..\agg23\include\agg_gamma_functions.h"\
! 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
! 	"..\..\..\agg23\include\agg_math.h"\
! 	"..\..\..\agg23\include\agg_math_stroke.h"\
! 	"..\..\..\agg23\include\agg_path_storage.h"\
! 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"..\..\..\agg23\include\agg_render_scanlines.h"\
! 	"..\..\..\agg23\include\agg_renderer_base.h"\
! 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
! 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
! 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
! 	"..\..\..\agg23\include\agg_scanline_p.h"\
! 	"..\..\..\agg23\include\agg_trans_affine.h"\
! 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
! 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
! 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
+ 	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_path.h"\
  	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 415,485 ****
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"c:\projects\agg23\font_freetype\agg_font_freetype.h"\
! 	"C:\Projects\agg23\include\agg_array.h"\
! 	"C:\Projects\agg23\include\agg_basics.h"\
! 	"C:\Projects\agg23\include\agg_clip_liang_barsky.h"\
! 	"C:\Projects\agg23\include\agg_color_rgba.h"\
! 	"C:\Projects\agg23\include\agg_config.h"\
! 	"C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"C:\Projects\agg23\include\agg_conv_contour.h"\
! 	"C:\Projects\agg23\include\agg_conv_curve.h"\
! 	"C:\Projects\agg23\include\agg_conv_stroke.h"\
! 	"C:\Projects\agg23\include\agg_conv_transform.h"\
! 	"C:\Projects\agg23\include\agg_curves.h"\
! 	"C:\Projects\agg23\include\agg_dda_line.h"\
! 	"C:\Projects\agg23\include\agg_ellipse.h"\
! 	"C:\Projects\agg23\include\agg_ellipse_bresenham.h"\
! 	"C:\Projects\agg23\include\agg_font_cache_manager.h"\
! 	"C:\Projects\agg23\include\agg_gamma_functions.h"\
! 	"C:\Projects\agg23\include\agg_line_aa_basics.h"\
! 	"C:\Projects\agg23\include\agg_math.h"\
! 	"C:\Projects\agg23\include\agg_math_stroke.h"\
! 	"C:\Projects\agg23\include\agg_path_storage.h"\
! 	"C:\Projects\agg23\include\agg_path_storage_integer.h"\
! 	"C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_outline.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\
! 	"C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"C:\Projects\agg23\include\agg_render_scanlines.h"\
! 	"C:\Projects\agg23\include\agg_renderer_base.h"\
! 	"C:\Projects\agg23\include\agg_renderer_outline_aa.h"\
! 	"C:\Projects\agg23\include\agg_renderer_primitives.h"\
! 	"C:\Projects\agg23\include\agg_renderer_scanline.h"\
! 	"C:\Projects\agg23\include\agg_rendering_buffer.h"\
! 	"C:\Projects\agg23\include\agg_scanline_bin.h"\
! 	"C:\Projects\agg23\include\agg_scanline_p.h"\
! 	"C:\Projects\agg23\include\agg_scanline_storage_aa.h"\
! 	"C:\Projects\agg23\include\agg_scanline_storage_bin.h"\
! 	"C:\Projects\agg23\include\agg_scanline_u.h"\
! 	"C:\Projects\agg23\include\agg_trans_affine.h"\
! 	"C:\Projects\agg23\include\agg_vcgen_contour.h"\
! 	"C:\Projects\agg23\include\agg_vcgen_stroke.h"\
! 	"C:\Projects\agg23\include\agg_vertex_sequence.h"\
  	
! # ADD CPP /I "C:\Projects\agg23\include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Profiler"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\freetype\include\freetype\config\ftheader.h"\
! 	"..\..\..\freetype\include\ft2build.h"\
! 	"..\..\..\fribidi\fribidi.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.h"\
! 	"..\..\..\fribidi\fribidi_char_sets.i"\
! 	"..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1255.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_cp1256.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\
! 	"..\..\..\fribidi\fribidi_char_sets_utf8.h"\
! 	"..\..\..\fribidi\fribidi_config.h"\
! 	"..\..\..\fribidi\fribidi_types.h"\
! 	"..\..\..\fribidi\fribidi_types.i"\
! 	"..\..\..\fribidi\fribidi_unicode.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
--- 453,506 ----
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
! 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	
! # ADD CPP /I "../../../agg23/include"
  
  !ELSEIF  "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Profiler"
  
  DEP_CPP_ROADM=\
! 	"..\..\..\agg23\include\agg_array.h"\
! 	"..\..\..\agg23\include\agg_basics.h"\
! 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
! 	"..\..\..\agg23\include\agg_color_rgba.h"\
! 	"..\..\..\agg23\include\agg_config.h"\
! 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
! 	"..\..\..\agg23\include\agg_conv_contour.h"\
! 	"..\..\..\agg23\include\agg_conv_stroke.h"\
! 	"..\..\..\agg23\include\agg_conv_transform.h"\
! 	"..\..\..\agg23\include\agg_curves.h"\
! 	"..\..\..\agg23\include\agg_dda_line.h"\
! 	"..\..\..\agg23\include\agg_ellipse.h"\
! 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
! 	"..\..\..\agg23\include\agg_gamma_functions.h"\
! 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
! 	"..\..\..\agg23\include\agg_math.h"\
! 	"..\..\..\agg23\include\agg_math_stroke.h"\
! 	"..\..\..\agg23\include\agg_path_storage.h"\
! 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
! 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
! 	"..\..\..\agg23\include\agg_render_scanlines.h"\
! 	"..\..\..\agg23\include\agg_renderer_base.h"\
! 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
! 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
! 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
! 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
! 	"..\..\..\agg23\include\agg_scanline_p.h"\
! 	"..\..\..\agg23\include\agg_trans_affine.h"\
! 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
! 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
! 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
! 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
+ 	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_path.h"\
  	"..\..\..\roadmap_screen.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 488,534 ****
  	"..\..\roadmap_wincecanvas.h"\
  	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
- 	"c:\projects\agg23\font_freetype\agg_font_freetype.h"\
- 	"C:\Projects\agg23\include\agg_array.h"\
- 	"C:\Projects\agg23\include\agg_basics.h"\
- 	"C:\Projects\agg23\include\agg_clip_liang_barsky.h"\
- 	"C:\Projects\agg23\include\agg_color_rgba.h"\
- 	"C:\Projects\agg23\include\agg_config.h"\
- 	"C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\
- 	"C:\Projects\agg23\include\agg_conv_contour.h"\
- 	"C:\Projects\agg23\include\agg_conv_curve.h"\
- 	"C:\Projects\agg23\include\agg_conv_stroke.h"\
- 	"C:\Projects\agg23\include\agg_conv_transform.h"\
- 	"C:\Projects\agg23\include\agg_curves.h"\
- 	"C:\Projects\agg23\include\agg_dda_line.h"\
- 	"C:\Projects\agg23\include\agg_ellipse.h"\
- 	"C:\Projects\agg23\include\agg_ellipse_bresenham.h"\
- 	"C:\Projects\agg23\include\agg_font_cache_manager.h"\
- 	"C:\Projects\agg23\include\agg_gamma_functions.h"\
- 	"C:\Projects\agg23\include\agg_line_aa_basics.h"\
- 	"C:\Projects\agg23\include\agg_math.h"\
- 	"C:\Projects\agg23\include\agg_math_stroke.h"\
- 	"C:\Projects\agg23\include\agg_path_storage.h"\
- 	"C:\Projects\agg23\include\agg_path_storage_integer.h"\
- 	"C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_outline.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\
- 	"C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\
- 	"C:\Projects\agg23\include\agg_render_scanlines.h"\
- 	"C:\Projects\agg23\include\agg_renderer_base.h"\
- 	"C:\Projects\agg23\include\agg_renderer_outline_aa.h"\
- 	"C:\Projects\agg23\include\agg_renderer_primitives.h"\
- 	"C:\Projects\agg23\include\agg_renderer_scanline.h"\
- 	"C:\Projects\agg23\include\agg_rendering_buffer.h"\
- 	"C:\Projects\agg23\include\agg_scanline_bin.h"\
- 	"C:\Projects\agg23\include\agg_scanline_p.h"\
- 	"C:\Projects\agg23\include\agg_scanline_storage_aa.h"\
- 	"C:\Projects\agg23\include\agg_scanline_storage_bin.h"\
- 	"C:\Projects\agg23\include\agg_scanline_u.h"\
- 	"C:\Projects\agg23\include\agg_trans_affine.h"\
- 	"C:\Projects\agg23\include\agg_vcgen_contour.h"\
- 	"C:\Projects\agg23\include\agg_vcgen_stroke.h"\
- 	"C:\Projects\agg23\include\agg_vertex_sequence.h"\
  	
! # ADD CPP /I "C:\Projects\agg23\include"
  
  !ENDIF 
--- 509,514 ----
  	"..\..\roadmap_wincecanvas.h"\
  	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	
! # ADD CPP /I "../../../agg23/include"
  
  !ENDIF 
***************
*** 592,598 ****
--- 572,588 ----
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_dialog.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_start.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	{$(INCLUDE)}"aygshell.h"\
  	{$(INCLUDE)}"sipapi.h"\
***************
*** 611,619 ****
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
  	
  NODEP_CPP_ROADMA=\
- 	".\inuserm.h"\
- 	".\ipapi.h"\
- 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 601,609 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	{$(INCLUDE)}"aygshell.h"\
+ 	{$(INCLUDE)}"sipapi.h"\
+ 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADMA=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
***************
*** 763,770 ****
--- 753,770 ----
  DEP_CPP_ROADMAP_=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_factory.h"\
+ 	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_list.h"\
+ 	"..\..\..\roadmap_main.h"\
  	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_serial.h"\
+ 	"..\..\..\roadmap_spawn.h"\
  	"..\..\..\roadmap_start.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  

[Roadmap-commit] roadmap_editor/src/win32/wince_env/agg23 agg23.vcp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg23
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11707/agg23

Modified Files:
	agg23.vcp 
Log Message:
Update evc4 project files.

Index: agg23.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg23/agg23.vcp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** agg23.vcp	23 Apr 2006 13:32:24 -0000	1.1
--- agg23.vcp	29 Apr 2006 10:53:08 -0000	1.2
***************
*** 46,50 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "../../../agg23/include" /I "../../../freetype/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c
  # SUBTRACT CPP /YX
  LIB32=link.exe -lib
--- 46,50 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /I "../../../agg23/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /O2 /M$(CECrtMT) /c
  # SUBTRACT CPP /YX
  LIB32=link.exe -lib
***************
*** 72,76 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
! # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg23/include" /I "../../../freetype/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /M$(CECrtMTDebug) /c
  # SUBTRACT CPP /YX
  LIB32=link.exe -lib
--- 72,76 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
! # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg23/include" /I "../../../freetype/include" /I "../../../fribidi" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /M$(CECrtMTDebug) /c
  # SUBTRACT CPP /YX
  LIB32=link.exe -lib
***************
*** 225,228 ****
--- 225,313 ----
  	
  # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\..\agg23\src\platform\win32\agg_win32_bmp.cpp
+ DEP_CPP_AGG_W=\
+ 	"..\..\..\agg23\include\agg_basics.h"\
+ 	"..\..\..\agg23\include\agg_config.h"\
+ 	"..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\
+ 	
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\..\agg23\roadmap_canvas.cpp
+ DEP_CPP_ROADM=\
+ 	"..\..\..\agg23\font_freetype\agg_font_freetype.h"\
+ 	"..\..\..\agg23\include\agg_array.h"\
+ 	"..\..\..\agg23\include\agg_basics.h"\
+ 	"..\..\..\agg23\include\agg_clip_liang_barsky.h"\
+ 	"..\..\..\agg23\include\agg_color_rgba.h"\
+ 	"..\..\..\agg23\include\agg_config.h"\
+ 	"..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\
+ 	"..\..\..\agg23\include\agg_conv_contour.h"\
+ 	"..\..\..\agg23\include\agg_conv_curve.h"\
+ 	"..\..\..\agg23\include\agg_conv_stroke.h"\
+ 	"..\..\..\agg23\include\agg_conv_transform.h"\
+ 	"..\..\..\agg23\include\agg_curves.h"\
+ 	"..\..\..\agg23\include\agg_dda_line.h"\
+ 	"..\..\..\agg23\include\agg_ellipse.h"\
+ 	"..\..\..\agg23\include\agg_ellipse_bresenham.h"\
+ 	"..\..\..\agg23\include\agg_font_cache_manager.h"\
+ 	"..\..\..\agg23\include\agg_gamma_functions.h"\
+ 	"..\..\..\agg23\include\agg_line_aa_basics.h"\
+ 	"..\..\..\agg23\include\agg_math.h"\
+ 	"..\..\..\agg23\include\agg_math_stroke.h"\
+ 	"..\..\..\agg23\include\agg_path_storage.h"\
+ 	"..\..\..\agg23\include\agg_path_storage_integer.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb.h"\
+ 	"..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\
+ 	"..\..\..\agg23\include\agg_render_scanlines.h"\
+ 	"..\..\..\agg23\include\agg_renderer_base.h"\
+ 	"..\..\..\agg23\include\agg_renderer_outline_aa.h"\
+ 	"..\..\..\agg23\include\agg_renderer_primitives.h"\
+ 	"..\..\..\agg23\include\agg_renderer_scanline.h"\
+ 	"..\..\..\agg23\include\agg_rendering_buffer.h"\
+ 	"..\..\..\agg23\include\agg_scanline_bin.h"\
+ 	"..\..\..\agg23\include\agg_scanline_p.h"\
+ 	"..\..\..\agg23\include\agg_scanline_storage_aa.h"\
+ 	"..\..\..\agg23\include\agg_scanline_storage_bin.h"\
+ 	"..\..\..\agg23\include\agg_scanline_u.h"\
+ 	"..\..\..\agg23\include\agg_trans_affine.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_contour.h"\
+ 	"..\..\..\agg23\include\agg_vcgen_stroke.h"\
+ 	"..\..\..\agg23\include\agg_vertex_sequence.h"\
+ 	"..\..\..\freetype\include\freetype\config\ftheader.h"\
+ 	"..\..\..\freetype\include\ft2build.h"\
+ 	"..\..\..\fribidi\fribidi.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets.i"\
+ 	"..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_cp1255.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_cp1256.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\
+ 	"..\..\..\fribidi\fribidi_char_sets_utf8.h"\
+ 	"..\..\..\fribidi\fribidi_config.h"\
+ 	"..\..\..\fribidi\fribidi_types.h"\
+ 	"..\..\..\fribidi\fribidi_types.i"\
+ 	"..\..\..\fribidi\fribidi_unicode.h"\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_canvas_agg.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_messagebox.h"\
+ 	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_screen.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
+ 	
+ # End Source File
  # End Group
  # Begin Group "Header Files"

[Roadmap-commit] roadmap_editor/src/win32 roadmap_canvas_agg.cpp,NONE,1.1 roadmap_main.cpp,1.8,1.9 roadmap_wincecanvas.h,1.1.1.1,1.2 roadmap_canvas.cpp,1.2,NONE

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10717

Modified Files:
	roadmap_main.cpp roadmap_wincecanvas.h 
Added Files:
	roadmap_canvas_agg.cpp 
Removed Files:
	roadmap_canvas.cpp 
Log Message:
Add agg win32 specific implementation.

Index: roadmap_main.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_main.cpp	21 Apr 2006 17:29:25 -0000	1.8
--- roadmap_main.cpp	29 Apr 2006 10:52:09 -0000	1.9
***************
*** 391,395 ****
  				point.y -= 26;
  			}
! 			roadmap_canvas_mouse_move(&point);
  		}
  		break;
--- 391,395 ----
  				point.y -= 26;
  			}
! 			roadmap_canvas_mouse_moved(&point);
  		}
  		break;

Index: roadmap_wincecanvas.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_wincecanvas.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_wincecanvas.h	15 Oct 2005 22:19:21 -0000	1.1.1.1
--- roadmap_wincecanvas.h	29 Apr 2006 10:52:09 -0000	1.2
***************
*** 37,41 ****
  void roadmap_canvas_button_pressed(POINT *data);
  void roadmap_canvas_button_released(POINT *data);
! void roadmap_canvas_mouse_move(POINT *data);
  
  #endif // INCLUDE__ROADMAP_WINCE_CANVAS__H
--- 37,41 ----
  void roadmap_canvas_button_pressed(POINT *data);
  void roadmap_canvas_button_released(POINT *data);
! void roadmap_canvas_mouse_moved(POINT *data);
  
  #endif // INCLUDE__ROADMAP_WINCE_CANVAS__H

--- roadmap_canvas.cpp DELETED ---

--- NEW FILE: roadmap_canvas_agg.cpp ---
/* roadmap_canvas.cpp - manage the canvas that is used to draw the map with agg
 *
 * LICENSE:
 *
 *   Copyright 2006 Ehud Shabtai
 *
 *   This file is part of RoadMap.
 *
 *   RoadMap is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   RoadMap is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with RoadMap; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * SYNOPSYS:
 *
 *   See roadmap_canvas.h.
 */

#include <windows.h>

#define USE_FRIBIDI

#ifdef WIN32_PROFILE
#include <C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h>
#endif

#include "agg_rendering_buffer.h"
#include "agg_curves.h"
#include "agg_conv_stroke.h"
#include "agg_conv_contour.h"
#include "agg_conv_transform.h"
#include "agg_rasterizer_scanline_aa.h"
#include "agg_rasterizer_outline_aa.h"
#include "agg_rasterizer_outline.h"
#include "agg_renderer_primitives.h"
#include "agg_ellipse.h"
#include "agg_renderer_scanline.h"
#include "agg_scanline_p.h"
#include "agg_renderer_outline_aa.h"
#include "agg_pixfmt_rgb_packed.h"
#include "agg_path_storage.h"
#include "platform/win32/agg_win32_bmp.h"

extern "C" {
#include "../roadmap.h"
#include "../roadmap_canvas.h"
#include "../roadmap_messagebox.h"
#include "../roadmap_math.h"
#include "../roadmap_config.h"
#include "../roadmap_path.h"
#include "../roadmap_screen.h"
#include "roadmap_wincecanvas.h"
#include "colors.h"
}

#include "../roadmap_canvas_agg.h"

static HWND			RoadMapDrawingArea;
static HDC			RoadMapDrawingBuffer;
static RECT			ClientRect;
static HBITMAP		OldBitmap = NULL;


int roadmap_canvas_agg_to_wchar (const char *text, wchar_t *output, int size) {

	LPWSTR text_unicode = ConvertToWideChar(text, CP_UTF8);
   wcsncpy(output, text_unicode, size);
   output[size - 1] = 0;

   return wcslen(output);
}


agg::rgba8 roadmap_canvas_agg_parse_color (const char *color) {
	int high, i, low;
	
	if (*color == '#') {
		int r, g, b;
		sscanf(color, "#%2x%2x%2x", &r, &g, &b);
      return agg::rgba8(r, g, b);
	} else {
		/* Do binary search on color table */
		for (low=(-1), high=sizeof(color_table)/sizeof(color_table[0]);
		high-low > 1;) {
			i = (high+low) / 2;
			if (strcmp(color, color_table[i].name) <= 0) high = i;
			else low = i;
		}
		
		if (!strcmp(color, color_table[high].name)) {
         return agg::rgba8(color_table[high].r, color_table[high].g,
            color_table[high].b);
		} else {
         return agg::rgba8(0, 0, 0);
		}
	}	
}


void roadmap_canvas_button_pressed(POINT *data) {
   RoadMapGuiPoint point;
   
   point.x = (short)data->x;
   point.y = (short)data->y;
   
   (*RoadMapCanvasMouseButtonPressed) (&point);
   
}


void roadmap_canvas_button_released(POINT *data) {
   RoadMapGuiPoint point;
   
   point.x = (short)data->x;
   point.y = (short)data->y;
   
   (*RoadMapCanvasMouseButtonReleased) (&point);
   
}


void roadmap_canvas_mouse_moved(POINT *data) {
   RoadMapGuiPoint point;
   
   point.x = (short)data->x;
   point.y = (short)data->y;
   
   (*RoadMapCanvasMouseMoved) (&point);
   
}


void roadmap_canvas_refresh (void) {
   HDC hdc;
   
   if (RoadMapDrawingArea == NULL) return;
   
   dbg_time_start(DBG_TIME_FLIP);
   
   hdc = GetDC(RoadMapDrawingArea);
   BitBlt(hdc, ClientRect.left, ClientRect.top,
      ClientRect.right - ClientRect.left + 1,
      ClientRect.bottom - ClientRect.top + 1,
      RoadMapDrawingBuffer, 0, 0, SRCCOPY); 
   
   DeleteDC(hdc);
   dbg_time_end(DBG_TIME_FLIP);
}


HWND roadmap_canvas_new (HWND hWnd, HWND tool_bar) {
   HDC hdc;
   static BITMAPINFO* bmp_info = (BITMAPINFO*) malloc(sizeof(BITMAPINFO) +
                                       (sizeof(RGBQUAD)*3)); 
   HBITMAP bmp;
   void* buf = 0;
   
   memset(bmp_info, 0, sizeof(BITMAPINFO) + sizeof(RGBQUAD)*3);

   if ((RoadMapDrawingBuffer != NULL) && IsWindowVisible(tool_bar)) {
      
      DeleteObject(SelectObject(RoadMapDrawingBuffer, OldBitmap));
      DeleteDC(RoadMapDrawingBuffer);
   }
   
   hdc = GetDC(RoadMapDrawingArea);
   
   RoadMapDrawingArea = hWnd;
   GetClientRect(hWnd, &ClientRect);
   if (tool_bar != NULL) {
      RECT tb_rect;
      GetClientRect(tool_bar, &tb_rect);
      ClientRect.top += tb_rect.bottom;
   }
   
   
   RoadMapDrawingBuffer = CreateCompatibleDC(hdc);
   
   bmp_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); 
   bmp_info->bmiHeader.biWidth = ClientRect.right - ClientRect.left + 1;
   bmp_info->bmiHeader.biHeight = ClientRect.bottom - ClientRect.top + 1; 
   bmp_info->bmiHeader.biPlanes = 1; 
   bmp_info->bmiHeader.biBitCount = 16; 
   bmp_info->bmiHeader.biCompression = BI_BITFIELDS; 
   bmp_info->bmiHeader.biSizeImage = 0; 
   bmp_info->bmiHeader.biXPelsPerMeter = 0; 
   bmp_info->bmiHeader.biYPelsPerMeter = 0; 
   bmp_info->bmiHeader.biClrUsed = 0; 
   bmp_info->bmiHeader.biClrImportant = 0; 
   ((DWORD*)bmp_info->bmiColors)[0] = 0xF800;
   ((DWORD*)bmp_info->bmiColors)[1] = 0x07E0;
   ((DWORD*)bmp_info->bmiColors)[2] = 0x001F; 
   
   bmp = CreateDIBSection( 
      RoadMapDrawingBuffer, 
      bmp_info, 
      DIB_RGB_COLORS, 
      &buf, 
      0, 
      0 
      ); 
   
   int stride = (((ClientRect.right - ClientRect.left + 1) * 2 + 3) >> 2) << 2;
   roadmap_canvas_agg_configure((unsigned char*)buf,
      ClientRect.right - ClientRect.left + 1,
      ClientRect.bottom - ClientRect.top + 1,
      -stride);
      
   OldBitmap = (HBITMAP)SelectObject(RoadMapDrawingBuffer, bmp);
   
   DeleteDC(hdc);
   (*RoadMapCanvasConfigure) ();
   
   return RoadMapDrawingArea;
}

RoadMapImage roadmap_canvas_agg_load_image (const char *path, const char *file_name) {

   char *full_name = roadmap_path_join (path, file_name);

   agg::pixel_map pmap_tmp;
   if(!pmap_tmp.load_from_bmp(full_name)) {
      free(full_name);
      return NULL;
   }

   free(full_name);

   if (pmap_tmp.bpp() != 24) {
      return NULL;
   }
   
   int width = pmap_tmp.width();
   int height = pmap_tmp.height();

   unsigned char *buf = (unsigned char *)malloc (width*height*3);
   memcpy (buf, pmap_tmp.buf(), width*height*3);

   //agg::rendering_buffer tmp_rbuf (pmap_tmp.buf(),
   //                              width, height,
   //                               pmap_tmp.stride());

   //agg::pixfmt_rgb24 tmp_pixfmt (tmp_rbuf);
   //agg::renderer_base<agg::pixfmt_rgb24> tmp_ren(tmp_pixfmt);

   RoadMapImage image =  new roadmap_canvas_image();
   
   /*
   int stride = ((width * 2 + 3) >> 2) << 2;
   image->rbuf.attach (buf, width, height, stride);
   image->ren.attach (image->pixfmt);
   agg::color_conv(&image->rbuf, &tmp_rbuf, agg::color_conv_rgb24_to_rgb565());
   */
   image->rbuf.attach (buf,
                       width, height,
                       -pmap_tmp.stride());
   return image;
}

[Roadmap-commit] roadmap README,1.89,1.90

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14833

Modified Files:
	README 
Log Message:
fixed a couple of typos, made some clarifications


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** README	21 Apr 2006 19:09:27 -0000	1.89
--- README	25 Apr 2006 21:54:21 -0000	1.90
***************
*** 1538,1546 ****
         Sometimes one doesn't really want to follow a route at all -- all
         you want to do is set a goal, and be kept informed of how far away
!        it is, and in which direction.  That's what the "Quick Destination"
!        menu entry is for.  Select where you want to go (a waypoint, a
!        street address, an intersection, or latitude/longitude spot), and as
!        you move around, the display will show continously display the
!        distance and direction to that point.
  
  ** Following a route:
--- 1538,1547 ----
         Sometimes one doesn't really want to follow a route at all -- all
         you want to do is set a goal, and be kept informed of how far away
!        it is, and in which direction.  (This might be useful for geocaching,
!        for instance.)  That's what the "Quick Destination" menu entry is
!        for.  Select where you want to go (a waypoint, a street address, an
!        intersection, or latitude/longitude spot), and as you move around,
!        the display will continously display the distance and direction
!        to that point.
  
  ** Following a route:
***************
*** 1554,1558 ****
         information, the directions to the next waypoint (if any are present
         in the waypoint's comments), its distance, etc.  The messages will
!        disply at the corners of the map.  (see CONFIGURATION for more
         information about these user configurable messages).
  
--- 1555,1559 ----
         information, the directions to the next waypoint (if any are present
         in the waypoint's comments), its distance, etc.  The messages will
!        display at the corners of the map.  (see CONFIGURATION for more
         information about these user configurable messages).
  
***************
*** 2691,2695 ****
       Routes and tracks are very similar:  it's most useful to
       think of a route as "where you want to go", and a track as
!      "where you've been".  Routes are usually composed, either
       manually or using navigation software.  Tracks are usually
       recorded, by making a note of one's GPS location
--- 2692,2696 ----
       Routes and tracks are very similar:  it's most useful to
       think of a route as "where you want to go", and a track as
!      "where you've been".  Routes are usually "composed", either
       manually or using navigation software.  Tracks are usually
       recorded, by making a note of one's GPS location
***************
*** 2702,2709 ****
       reduce confusion, RoadMap tries to use the term "waypoint"
       to _only_ refer to points which are contained in routes and
!      tracks.  Points unassociated with a specific route or track
!      are called "landmarks".  If you read the GPX documentation
!      you'll find that these points are usually all called
!      waypoints.
  
       Waypoints simply represent a place, along with some other
--- 2703,2710 ----
       reduce confusion, RoadMap tries to use the term "waypoint"
       to _only_ refer to points which are contained in routes and
!      tracks.  Points that are unassociated with a specific route
!      or track are called "landmarks".  If you read the GPX
!      documentation you'll find that everything is called a
!      waypoint.
  
       Waypoints simply represent a place, along with some other
***************
*** 2811,2815 ****
          want to keep handy no matter what trip file you have
          loaded.  Examples might include your home, your office,
!         your hairdress, etc.  When writing this file, only the
          personal landmarks are written.  When reading, only the
          unassociated waypoints are read -- any routes or tracks
--- 2812,2816 ----
          want to keep handy no matter what trip file you have
          loaded.  Examples might include your home, your office,
!         your hairdresser, etc.  When writing this file, only the
          personal landmarks are written.  When reading, only the
          unassociated waypoints are read -- any routes or tracks

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libft libft.vcp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9900

Modified Files:
	libft.vcp 
Log Message:
Fix release configuration.

Index: libft.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft/libft.vcp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** libft.vcp	23 Apr 2006 13:32:25 -0000	1.1
--- libft.vcp	24 Apr 2006 07:09:43 -0000	1.2
***************
*** 568,573 ****
  !IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"
  
- # PROP Exclude_From_Build 1
- 
  !ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"
  
--- 568,571 ----
***************
*** 575,579 ****
  
  # PROP BASE Exclude_From_Build 1
- # PROP Exclude_From_Build 1
  
  !ENDIF 
--- 573,576 ----

[Roadmap-commit] roadmap_editor/src/win32 roadmap_canvas.cpp,1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9301

Modified Files:
	roadmap_canvas.cpp 
Log Message:
Fix color corruption.

Index: roadmap_canvas.cpp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_canvas.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_canvas.cpp	23 Apr 2006 13:30:47 -0000	1.1
--- roadmap_canvas.cpp	24 Apr 2006 07:08:59 -0000	1.2
***************
*** 591,598 ****
  {
     HDC hdc;
!    BITMAPINFO bmp_info; 
     HBITMAP bmp;
     void* buf = 0;
!    
     if ((RoadMapDrawingBuffer != NULL) && IsWindowVisible(tool_bar)) {
        
--- 591,601 ----
  {
     HDC hdc;
!    static BITMAPINFO* bmp_info = (BITMAPINFO*) malloc(sizeof(BITMAPINFO) +
!                                        (sizeof(RGBQUAD)*3)); 
     HBITMAP bmp;
     void* buf = 0;
!    
!    memset(bmp_info, 0, sizeof(BITMAPINFO) + sizeof(RGBQUAD)*3);
! 
     if ((RoadMapDrawingBuffer != NULL) && IsWindowVisible(tool_bar)) {
        
***************
*** 614,635 ****
     RoadMapDrawingBuffer = CreateCompatibleDC(hdc);
     
!    bmp_info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); 
!    bmp_info.bmiHeader.biWidth = ClientRect.right - ClientRect.left + 1;
!    bmp_info.bmiHeader.biHeight = ClientRect.bottom - ClientRect.top + 1; 
!    bmp_info.bmiHeader.biPlanes = 1; 
!    bmp_info.bmiHeader.biBitCount = 16; 
!    bmp_info.bmiHeader.biCompression = BI_BITFIELDS; 
!    bmp_info.bmiHeader.biSizeImage = 0; 
!    bmp_info.bmiHeader.biXPelsPerMeter = 0; 
!    bmp_info.bmiHeader.biYPelsPerMeter = 0; 
!    bmp_info.bmiHeader.biClrUsed = 0; 
!    bmp_info.bmiHeader.biClrImportant = 0; 
!    ((DWORD*)bmp_info.bmiColors)[0] = 0xF800;
!    ((DWORD*)bmp_info.bmiColors)[1] = 0x07E0;
!    ((DWORD*)bmp_info.bmiColors)[2] = 0x001F; 
     
     bmp = CreateDIBSection( 
        RoadMapDrawingBuffer, 
!       &bmp_info, 
        DIB_RGB_COLORS, 
        &buf, 
--- 617,638 ----
     RoadMapDrawingBuffer = CreateCompatibleDC(hdc);
     
!    bmp_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); 
!    bmp_info->bmiHeader.biWidth = ClientRect.right - ClientRect.left + 1;
!    bmp_info->bmiHeader.biHeight = ClientRect.bottom - ClientRect.top + 1; 
!    bmp_info->bmiHeader.biPlanes = 1; 
!    bmp_info->bmiHeader.biBitCount = 16; 
!    bmp_info->bmiHeader.biCompression = BI_BITFIELDS; 
!    bmp_info->bmiHeader.biSizeImage = 0; 
!    bmp_info->bmiHeader.biXPelsPerMeter = 0; 
!    bmp_info->bmiHeader.biYPelsPerMeter = 0; 
!    bmp_info->bmiHeader.biClrUsed = 0; 
!    bmp_info->bmiHeader.biClrImportant = 0; 
!    ((DWORD*)bmp_info->bmiColors)[0] = 0xF800;
!    ((DWORD*)bmp_info->bmiColors)[1] = 0x07E0;
!    ((DWORD*)bmp_info->bmiColors)[2] = 0x001F; 
     
     bmp = CreateDIBSection( 
        RoadMapDrawingBuffer, 
!       bmp_info, 
        DIB_RGB_COLORS, 
        &buf, 

[Roadmap-commit] roadmap_editor/src roadmap_screen.c,1.5,1.6

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5761

Modified Files:
	roadmap_screen.c 
Log Message:
Label support.

Index: roadmap_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_screen.c	31 Dec 2005 09:57:09 -0000	1.5
--- roadmap_screen.c	23 Apr 2006 17:02:25 -0000	1.6
***************
*** 52,55 ****
--- 52,56 ----
  #include "roadmap_pointer.h"
  #include "roadmap_display.h"
+ #include "roadmap_label.h"
  #include "roadmap_plugin.h"
  
***************
*** 189,193 ****
                                     int last_shape,
                                     RoadMapShapeItr shape_itr,
!                                    RoadMapPen pen) {
     RoadMapGuiPoint point0;
     RoadMapGuiPoint point1;
--- 190,197 ----
                                     int last_shape,
                                     RoadMapShapeItr shape_itr,
!                                    RoadMapPen pen,
!                                    int *total_length,
!                                    RoadMapGuiPoint *middle,
!                                    int *angle) {
     RoadMapGuiPoint point0;
     RoadMapGuiPoint point1;
***************
*** 201,204 ****
--- 205,213 ----
  
     int last_point_visible = 0;
+    int longest_segent = -1;
+ 
+    dbg_time_start(DBG_TIME_DRAW_ONE_LINE);
+ 
+    if (total_length) *total_length = 0;
  
     /* if the pen has changed, we need to flush the prevoius lines and points
***************
*** 263,266 ****
--- 272,288 ----
              }
  
+             if (total_length) {
+ 
+                int length = (int)(sqrt(pow(point1.x - point0.x,2) + pow(point1.y - point0.y,2)));
+                *total_length += length;
+ 
+                if (length > longest_segent) {
+                   longest_segent = length;
+                   *angle = roadmap_math_azymuth(&last_midposition, &midposition);
+                   middle->x = (point1.x + point0.x) / 2;
+                   middle->y = (point1.y + point0.y) / 2;
+                }
+             }
+ 
              /* Show this line: add 2 points if this is the start of a new
               * complete line (i.e. the first visible line), or just add
***************
*** 300,303 ****
--- 322,338 ----
                          (&last_midposition, to, &point0, &point1)) {
  
+          if (total_length) {
+ 
+             int length = (int)(sqrt(pow(point1.x - point0.x,2) + pow(point1.y - point0.y,2)));
+             *total_length += length;
+ 
+             if (length > longest_segent) {
+                longest_segent = length;
+                *angle = roadmap_math_azymuth(&last_midposition, to);
+                middle->x = (point1.x + point0.x) / 2;
+                middle->y = (point1.y + point0.y) / 2;
+             }
+          }
+ 
           if (!last_point_visible) {
               *(points++) = point0; /* Show the start of this segment. */
***************
*** 327,331 ****
        /* Optimization: do not draw a line that is obviously not visible. */
        if (! fully_visible) {
!          if (! roadmap_math_line_is_visible (from, to)) return;
        }
  
--- 362,369 ----
        /* Optimization: do not draw a line that is obviously not visible. */
        if (! fully_visible) {
!          if (! roadmap_math_line_is_visible (from, to)) {
!             dbg_time_end(DBG_TIME_DRAW_ONE_LINE);
!             return;
!          }
        }
  
***************
*** 345,351 ****
--- 383,399 ----
           RoadMapScreenPoints.cursor += 1;
  
+          dbg_time_end(DBG_TIME_DRAW_ONE_LINE);
           return;
        }
        
+       if (total_length) {
+ 
+          *total_length = (int)(sqrt(pow(point1.x - point0.x,2) + pow(point1.y - point0.y,2)));
+ 
+          *angle = roadmap_math_azymuth(from, to);
+          middle->x = (point1.x + point0.x) / 2;
+          middle->y = (point1.y + point0.y) / 2;
+       }
+       
        if (RoadMapScreenLinePoints.cursor + 2 >= RoadMapScreenLinePoints.end) {
           roadmap_screen_flush_lines ();
***************
*** 361,364 ****
--- 409,414 ----
  
     }
+ 
+    dbg_time_end(DBG_TIME_DRAW_ONE_LINE);
  }
  
***************
*** 545,548 ****
--- 595,602 ----
     RoadMapPen layer_pen;
     int fips = roadmap_locator_active ();
+    int total_length;
+    int *total_length_ptr;
+    int angle;
+    RoadMapGuiPoint seg_middle;
  
     int drawn = 0;
***************
*** 553,556 ****
--- 607,616 ----
     layer_pen = roadmap_layer_get_pen (cfcc, pen_type);
  
+    if ((pen_type != 0) || RoadMapScreenDragging){
+       /* we do labels only for the first pen */
+       total_length_ptr = 0;
+    } else {
+       total_length_ptr = &total_length;
+    }
  
     /* Draw each line that belongs to this square. */
***************
*** 574,578 ****
              RoadMapPosition from;
              RoadMapPosition to;
!             RoadMapPen pen;
              
              if (first_shape_line >= 0) {
--- 634,639 ----
              RoadMapPosition from;
              RoadMapPosition to;
!             RoadMapPen pen = layer_pen;
! 
              
              if (first_shape_line >= 0) {
***************
*** 596,600 ****
              roadmap_screen_draw_one_line
                    (&from, &to, fully_visible, &from, first_shape, last_shape,
!                    roadmap_shape_get_position, pen);
              drawn += 1;
           }
--- 657,667 ----
              roadmap_screen_draw_one_line
                    (&from, &to, fully_visible, &from, first_shape, last_shape,
!                    roadmap_shape_get_position, pen, total_length_ptr, &seg_middle, &angle);
!             
!             if (total_length_ptr) {
!                PluginLine l = {ROADMAP_PLUGIN_ID, line, cfcc, fips};
!                roadmap_label_add (&seg_middle, angle, total_length, &l);
!             }
! 
              drawn += 1;
           }
***************
*** 699,703 ****
              roadmap_screen_draw_one_line
                    (&from, &to, fully_visible, &from, first_shape, last_shape,
!                    roadmap_shape_get_position, pen);
  
              drawn += 1;
--- 766,776 ----
              roadmap_screen_draw_one_line
                    (&from, &to, fully_visible, &from, first_shape, last_shape,
!                    roadmap_shape_get_position, pen, total_length_ptr, &seg_middle, &angle);
! 
!             if (total_length_ptr) {
! 
!                PluginLine l = {ROADMAP_PLUGIN_ID, real_line, cfcc, fips};
!                roadmap_label_add (&seg_middle, angle, total_length, &l);
!             }
  
              drawn += 1;
***************
*** 747,755 ****
  
  
! static int roadmap_screen_repaint_square (int square, int pen_type) {
  
     int i;
-    int count;
-    int layers[256];
  
     RoadMapArea edges;
--- 820,827 ----
  
  
! static int roadmap_screen_repaint_square (int square, int pen_type, 
!                                           int layer_count, int *layers) {
  
     int i;
  
     RoadMapArea edges;
***************
*** 763,766 ****
--- 835,841 ----
        return 0;
     }
+ 
+    dbg_time_start(DBG_TIME_DRAW_SQUARE);
+ 
     SquareOnScreen[square] = 1;
  
***************
*** 781,790 ****
  
     if (pen_type == 0) roadmap_screen_draw_square_edges (square);
- 
-    count = roadmap_layer_visible_lines (layers, 256, pen_type);
     
     RoadMapScreenLastPen = NULL;
  
!    for (i = 0; i < count; ++i) {
  
          category = layers[i];
--- 856,863 ----
  
     if (pen_type == 0) roadmap_screen_draw_square_edges (square);
     
     RoadMapScreenLastPen = NULL;
  
!    for (i = 0; i < layer_count; ++i) {
  
          category = layers[i];
***************
*** 793,801 ****
                      (square, category, fully_visible, pen_type);
  
-         roadmap_screen_flush_lines();
-         roadmap_screen_flush_points();
     }
  
     roadmap_log_pop ();
     return drawn;
  }
--- 866,877 ----
                      (square, category, fully_visible, pen_type);
  
     }
  
+    roadmap_screen_flush_lines();
+    roadmap_screen_flush_points();
+ 
     roadmap_log_pop ();
+    
+    dbg_time_end(DBG_TIME_DRAW_SQUARE);
     return drawn;
  }
***************
*** 813,823 ****
--- 889,902 ----
      int count;
      int max_pen = roadmap_layer_max_pen();
+     int use_only_main_pen = 0;
      
  
      if (RoadMapScreenFrozen) return;
  
+     dbg_time_start(DBG_TIME_FULL);
      if (RoadMapScreenDragging &&
          (! roadmap_config_match(&RoadMapConfigStylePrettyDrag, "yes"))) {
         max_pen = 1;
+        use_only_main_pen = 1;
      }
  
***************
*** 862,868 ****
  
              for (k = 0; k < max_pen; ++k) {
                 roadmap_screen_reset_square_mask();
                 for (j = count - 1; j >= 0; --j) {
!                   roadmap_screen_repaint_square (in_view[j], k);
                 }
              }
--- 941,960 ----
  
              for (k = 0; k < max_pen; ++k) {
+ 
+                int layer_count;
+                int layers[256];
+                int pen_type = k;
+ 
                 roadmap_screen_reset_square_mask();
+ 
+                layer_count = roadmap_layer_visible_lines (layers, 256, k);
+                if (!layer_count) continue;
+ 
+                if (use_only_main_pen) {
+                   pen_type = -1;
+                }
+ 
                 for (j = count - 1; j >= 0; --j) {
!                   roadmap_screen_repaint_square (in_view[j], pen_type, layer_count, layers);
                 }
              }
***************
*** 872,875 ****
--- 964,969 ----
          roadmap_screen_flush_lines ();
          roadmap_screen_flush_points ();
+ 
+         roadmap_label_draw_cache ();
      }
  
***************
*** 895,898 ****
--- 989,993 ----
  
      roadmap_log_pop ();
+     dbg_time_end(DBG_TIME_FULL);
  }
  
***************
*** 1383,1384 ****
--- 1478,1505 ----
  
  
+ int roadmap_screen_is_dragging (void) {
+ 
+    return RoadMapScreenDragging;
+ }
+ 
+ 
+ static unsigned long dbg_time_rec[DBG_TIME_LAST_COUNTER];
+ static unsigned long dbg_time_tmp[DBG_TIME_LAST_COUNTER];
+ 
+ #ifdef __WIN32
+ void dbg_time_start(int type) {
+    dbg_time_tmp[type] = GetTickCount();
+ }
+ 
+ void dbg_time_end(int type) {
+    dbg_time_rec[type] += GetTickCount() - dbg_time_tmp[type];
+ }
+ #else
+ void dbg_time_start(int type) {
+    dbg_time_tmp[type] = 0;
+ }
+ 
+ void dbg_time_end(int type) {
+    dbg_time_rec[type] += 0;
+ }
+ #endif

[Roadmap-commit] roadmap_editor/src roadmap_screen.h,1.1.1.1,1.2

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32446

Modified Files:
	roadmap_screen.h 
Log Message:
Label support.

Index: roadmap_screen.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_screen.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_screen.h	15 Oct 2005 22:19:05 -0000	1.1.1.1
--- roadmap_screen.h	23 Apr 2006 16:54:46 -0000	1.2
***************
*** 64,68 ****
                                     int last_shape,
                                     RoadMapShapeItr shape_itr,
!                                    RoadMapPen pen);
  
  void roadmap_screen_draw_line_direction (RoadMapPosition *from,
--- 64,71 ----
                                     int last_shape,
                                     RoadMapShapeItr shape_itr,
!                                    RoadMapPen pen,
!                                    int *total_length,
!                                    RoadMapGuiPoint *middle,
!                                    int *angle);
  
  void roadmap_screen_draw_line_direction (RoadMapPosition *from,
***************
*** 73,76 ****
                                           RoadMapShapeItr shape_itr,
                                           int width,
!                                          int direction);
  #endif // INCLUDE__ROADMAP_SCREEN__H
--- 76,102 ----
                                           RoadMapShapeItr shape_itr,
                                           int width,
!                                          int direction);
! 
! int roadmap_screen_is_dragging (void);
! 
! #define DBG_TIME_FULL 0
! #define DBG_TIME_DRAW_SQUARE 1
! #define DBG_TIME_DRAW_ONE_LINE 2
! #define DBG_TIME_SELECT_PEN 3
! #define DBG_TIME_DRAW_LINES 4
! #define DBG_TIME_CREATE_PATH 5
! #define DBG_TIME_ADD_PATH 6
! #define DBG_TIME_FLIP 7
! #define DBG_TIME_TEXT_FULL 8
! #define DBG_TIME_TEXT_CNV 9
! #define DBG_TIME_TEXT_LOAD 10
! #define DBG_TIME_TEXT_ONE_LETTER 11
! #define DBG_TIME_TEXT_GET_GLYPH 12
! #define DBG_TIME_TEXT_ONE_RAS 13
! 
! #define DBG_TIME_LAST_COUNTER 14
! 
! void dbg_time_start(int type);
! void dbg_time_end(int type);
! 
  #endif // INCLUDE__ROADMAP_SCREEN__H

[Roadmap-commit] roadmap_editor/src roadmap_math.c,1.4,1.5

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31522

Modified Files:
	roadmap_math.c 
Log Message:
Fix screen intersection function.

Index: roadmap_math.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_math.c	23 Apr 2006 14:28:46 -0000	1.4
--- roadmap_math.c	23 Apr 2006 16:53:22 -0000	1.5
***************
*** 346,350 ****
         */
        point.longitude = from->longitude;
!       point.latitude = RoadMapContext.upright_screen.north;
        count =
           roadmap_math_check_point_in_segment
--- 346,350 ----
         */
        point.longitude = from->longitude;
!       point.latitude = RoadMapContext.focus.north;
        count =
           roadmap_math_check_point_in_segment
***************
*** 353,357 ****
        if (count == max_intersections) return count;
  
!       point.latitude = RoadMapContext.upright_screen.south;
        count =
           roadmap_math_check_point_in_segment
--- 353,357 ----
        if (count == max_intersections) return count;
  
!       point.latitude = RoadMapContext.focus.south;
        count =
           roadmap_math_check_point_in_segment
***************
*** 368,372 ****
  
        point.latitude = from->latitude;
!       point.longitude = RoadMapContext.upright_screen.west;
        count =
           roadmap_math_check_point_in_segment
--- 368,372 ----
  
        point.latitude = from->latitude;
!       point.longitude = RoadMapContext.focus.west;
        count =
           roadmap_math_check_point_in_segment
***************
*** 375,379 ****
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.upright_screen.east;
        count =
           roadmap_math_check_point_in_segment
--- 375,379 ----
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.focus.east;
        count =
           roadmap_math_check_point_in_segment
***************
*** 384,388 ****
     } else {
        
!       point.latitude = RoadMapContext.upright_screen.north;
        point.longitude = (int) ((point.latitude - b) / a);
        count =
--- 384,388 ----
     } else {
        
!       point.latitude = RoadMapContext.focus.north;
        point.longitude = (int) ((point.latitude - b) / a);
        count =
***************
*** 391,395 ****
        if (count == max_intersections) return count;
  
!       point.latitude = RoadMapContext.upright_screen.south;
        point.longitude = (int) ((point.latitude - b) / a);
        count =
--- 391,395 ----
        if (count == max_intersections) return count;
  
!       point.latitude = RoadMapContext.focus.south;
        point.longitude = (int) ((point.latitude - b) / a);
        count =
***************
*** 398,402 ****
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.upright_screen.west;
        point.latitude = (int) (b + a * point.longitude);
        count =
--- 398,402 ----
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.focus.west;
        point.latitude = (int) (b + a * point.longitude);
        count =
***************
*** 405,409 ****
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.upright_screen.east;
        point.latitude = (int) (b + a * point.longitude);
        count =
--- 405,409 ----
        if (count == max_intersections) return count;
  
!       point.longitude = RoadMapContext.focus.east;
        point.latitude = (int) (b + a * point.longitude);
        count =

[Roadmap-commit] roadmap_editor/src/editor editor_screen.c,1.7,1.8

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv609

Modified Files:
	editor_screen.c 
Log Message:
Label support.
Disable road status drawing (too slow).

Index: editor_screen.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_screen.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editor_screen.c	22 Mar 2006 08:52:12 -0000	1.7
--- editor_screen.c	23 Apr 2006 14:43:51 -0000	1.8
***************
*** 279,282 ****
--- 279,283 ----
     if (!editor_is_enabled()) return;
  
+    if (thickness < 1) thickness = 1;
     if ((pen_count > 1) && (thickness < 3)) {
        pen_count = 1;
***************
*** 327,330 ****
--- 328,332 ----
     int has_route = 0;
  
+    return NO_ROAD_STATE;
     if (plugin_id == ROADMAP_PLUGIN_ID) {
        
***************
*** 346,350 ****
           } else if (editor_db_activate (fips) != -1) {
              
!             int route;
              route = editor_override_line_get_route (line);
  
--- 348,352 ----
           } else if (editor_db_activate (fips) != -1) {
              
!             int route = 0;
              route = editor_override_line_get_route (line);
  
***************
*** 415,419 ****
     } else {
        
!       road_state = editor_screen_get_road_state (line, 0, fips);
     }
  
--- 417,425 ----
     } else {
        
!       if (!roadmap_screen_is_dragging() && (pen_type > 0)) {
!          road_state = editor_screen_get_road_state (line, 0, fips);
!       } else {
!          road_state = NO_ROAD_STATE;
!       }
     }
  
***************
*** 622,626 ****
                 (&from, &to, fully_visible,
                  &trk_from_pos, first_shape, last_shape,
!                 editor_shape_position, pen);
  
        if ((EditorPens[cfcc][pen_type][0].thickness > 20) &&
--- 628,632 ----
                 (&from, &to, fully_visible,
                  &trk_from_pos, first_shape, last_shape,
!                 editor_shape_position, pen, 0, 0, 0);
  
        if ((EditorPens[cfcc][pen_type][0].thickness > 20) &&

[Roadmap-commit] roadmap_editor/src roadmap_start.c,1.13,1.14

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24068

Modified Files:
	roadmap_start.c 
Log Message:
Label support.

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** roadmap_start.c	22 Mar 2006 08:51:13 -0000	1.13
--- roadmap_start.c	23 Apr 2006 14:31:32 -0000	1.14
***************
*** 59,62 ****
--- 59,63 ----
  #include "roadmap_fuzzy.h"
  #include "roadmap_navigate.h"
+ #include "roadmap_label.h"
  #include "roadmap_display.h"
  #include "roadmap_locator.h"
***************
*** 164,167 ****
--- 165,173 ----
  }
  
+ static void roadmap_start_export_reset (void) {
+ 
+    editor_export_reset_dirty ();
+ }
+ 
  static void roadmap_start_download_map_done (void) {
  
***************
*** 495,498 ****
--- 501,507 ----
        "Export editor data", roadmap_start_export_data},
  
+    {"resetexport", "Reset export data", NULL, NULL,
+       "Reset export data", roadmap_start_export_reset},
+ 
     {"updatemap", "Update map", NULL, NULL,
        "Export editor data", roadmap_start_download_map},
***************
*** 513,516 ****
--- 522,526 ----
     "exportdata",
     "updatemap",
+ /*   "resetexport", */
  
     RoadMapFactorySeparator,
***************
*** 970,973 ****
--- 980,984 ----
     roadmap_fuzzy_initialize    ();
     roadmap_navigate_initialize ();
+    roadmap_label_initialize    ();
     roadmap_display_initialize  ();
     roadmap_voice_initialize    ();

[Roadmap-commit] roadmap_editor/src roadmap_plugin.c,1.3,1.4 roadmap_plugin.h,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22731

Modified Files:
	roadmap_plugin.c roadmap_plugin.h 
Log Message:
Label support.

Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_plugin.h	12 Dec 2005 20:35:42 -0000	1.3
--- roadmap_plugin.h	23 Apr 2006 14:29:47 -0000	1.4
***************
*** 55,58 ****
--- 55,59 ----
     const char *street_t2s;
     const char *city;
+    PluginStreet plugin_street;
  } PluginStreetProperties;
  

Index: roadmap_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_plugin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_plugin.c	12 Dec 2005 20:35:42 -0000	1.3
--- roadmap_plugin.c	23 Apr 2006 14:29:47 -0000	1.4
***************
*** 389,392 ****
--- 389,394 ----
        props->street_t2s = roadmap_street_get_street_t2s (&rm_properties);
        props->city = roadmap_street_get_city_name (&rm_properties);
+       props->plugin_street.plugin_id = ROADMAP_PLUGIN_ID;
+       props->plugin_street.street_id = rm_properties.street;
        return;
  

[Roadmap-commit] roadmap_editor/src roadmap_math.c,1.3,1.4 roadmap_math.h,1.3,1.4

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22012

Modified Files:
	roadmap_math.c roadmap_math.h 
Log Message:
Add point rotation function.

Index: roadmap_math.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_math.h	12 Dec 2005 20:42:02 -0000	1.3
--- roadmap_math.h	23 Apr 2006 14:28:46 -0000	1.4
***************
*** 71,74 ****
--- 71,77 ----
  void roadmap_math_rotate_coordinates (int count, RoadMapGuiPoint *points);
  
+ void roadmap_math_rotate_point (RoadMapGuiPoint *points,
+                                 RoadMapGuiPoint *center, int angle);
+ 
  void roadmap_math_rotate_object
           (int count, RoadMapGuiPoint *points,
***************
*** 77,80 ****
--- 80,85 ----
  int  roadmap_math_azymuth
          (const RoadMapPosition *point1, const RoadMapPosition *point2);
+ int roadmap_math_angle
+        (const RoadMapGuiPoint *point1, const RoadMapGuiPoint *point2);
  
  char *roadmap_math_distance_unit (void);
***************
*** 112,116 ****
  int  roadmap_math_delta_direction (int direction1, int direction2);
  
! int roadmap_math_distance_convert(const char *string, int *explicit);
  
  void roadmap_math_set_context (RoadMapPosition *position, int zoom);
--- 117,121 ----
  int  roadmap_math_delta_direction (int direction1, int direction2);
  
! int roadmap_math_distance_convert(const char *string, int *_explicit);
  
  void roadmap_math_set_context (RoadMapPosition *position, int zoom);

Index: roadmap_math.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_math.c	12 Dec 2005 20:42:02 -0000	1.3
--- roadmap_math.c	23 Apr 2006 14:28:46 -0000	1.4
***************
*** 467,470 ****
--- 467,507 ----
  
  
+ /* 
+  * rotate the coordinates of a point to an arbitrary angle
+  */
+ void roadmap_math_rotate_point (RoadMapGuiPoint *points,
+                                 RoadMapGuiPoint *center, int angle) {
+ 
+    static int cached_angle = 0;
+    static int sin_orientation;
+    static int cos_orientation;
+ 
+    int x;
+    int y;
+ 
+    if (angle == 0) return;
+ 
+    if (angle != cached_angle) {
+       cached_angle = angle;
+       roadmap_math_trigonometry (cached_angle,
+                                  &sin_orientation,
+                                  &cos_orientation);
+    }
+ 
+    x = points->x;
+    y = points->y;
+ 
+    points->x =
+       center->x +
+       (((x * cos_orientation)
+         + (y * sin_orientation) + 16383) / 32768);
+ 
+    points->y =
+       center->y -
+       (((y * cos_orientation)
+         - (x * sin_orientation) + 16383) / 32768);
+ }
+ 
+ 
  /* Rotate a specific object:
   * rotate the coordinates of the object's points according to the provided
***************
*** 747,761 ****
     }
  
-    /* if this is a multi-pen object, try to force a minimum thickness of 3
-     * so we'll get a pretty drawing. Otherwise set it to 1.
-     */
     if (use_multiple_pens && (ratio < 3)) {
!       if ((1.0 * RoadMapContext.zoom / declutter) < 0.50) {
!          ratio = 3;
!       } else {
!          ratio = 1;
!       }
     }
- 
     return (int) ratio;
  }
--- 784,790 ----
     }
  
     if (use_multiple_pens && (ratio < 3)) {
!       ratio = 1;
     }
     return (int) ratio;
  }
***************
*** 940,943 ****
--- 969,996 ----
  
  
+ int roadmap_math_angle
+        (const RoadMapGuiPoint *point1, const RoadMapGuiPoint *point2) {
+ 
+     int result;
+     int x;
+     int y;
+     double d;
+ 
+     x = point2->x - point1->x;
+     y = point2->y - point1->y;
+ 
+     d = sqrt ((x * x) + (y * y));
+     
+     if (d > 0.0001 || d < -0.0001) {
+         result = roadmap_math_arccosine
+                     ((int) ((32768 * y) / d), (x > 0)?1:-1);
+     } else {
+         result = 0;
+     }
+     
+     return result;
+ }
+ 
+ 
  int roadmap_math_distance
         (const RoadMapPosition *position1, const RoadMapPosition *position2) {

[Roadmap-commit] roadmap_editor/src roadmap_layer.c,1.3,1.4 roadmap_layer.h,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20642

Modified Files:
	roadmap_layer.c roadmap_layer.h 
Log Message:
Change thickness decrease.

Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** roadmap_layer.c	16 Dec 2005 14:40:35 -0000	1.3
--- roadmap_layer.c	23 Apr 2006 14:26:54 -0000	1.4
***************
*** 189,193 ****
          RoadMapClass *this_class = RoadMapLineClass + i;
  
!         for (j = this_class->count - 1; j >= 0; --j) {
  
              int category = this_class->category[j];
--- 189,193 ----
          RoadMapClass *this_class = RoadMapLineClass + i;
  
!         for (j = 0; j<this_class->count; ++j) {
  
              int category = this_class->category[j];
***************
*** 212,215 ****
--- 212,227 ----
     if (!roadmap_layer_is_visible (layer)) return NULL;
     
+    if (pen_type == -1) {
+ 
+       int i;
+       for (i=RoadMapMaxUsedPen; i>=0; i--) {
+ 
+          if (RoadMapCategory[layer].in_use[i])
+             return RoadMapCategory[layer].pen[i];
+       }
+ 
+       return NULL;   
+    }
+ 
     if (!RoadMapCategory[layer].in_use[pen_type]) return NULL;
     
***************
*** 255,262 ****
              }
  
!             roadmap_canvas_select_pen (category->pen[0]);
!             roadmap_canvas_set_thickness (thickness);
!             category->in_use[0] = 1;
  
              for (j = 1; j < category->pen_count; ++j) {
  
--- 267,276 ----
              }
  
!             if (thickness > 0) {
!                roadmap_canvas_select_pen (category->pen[0]);
!                roadmap_canvas_set_thickness (thickness);
!             }
  
+             category->in_use[0] = 1;
              for (j = 1; j < category->pen_count; ++j) {
  
***************
*** 436,441 ****
                thickness = category->delta_thickness[j];
             }
!            roadmap_canvas_set_thickness (thickness);
             roadmap_canvas_set_foreground (color[j]);
          }
      }
--- 450,458 ----
                thickness = category->delta_thickness[j];
             }
! 
             roadmap_canvas_set_foreground (color[j]);
+            if (thickness > 0) {
+               roadmap_canvas_set_thickness (thickness);
+            }
          }
      }

Index: roadmap_layer.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** roadmap_layer.h	28 Nov 2005 19:36:34 -0000	1.2
--- roadmap_layer.h	23 Apr 2006 14:26:54 -0000	1.3
***************
*** 35,39 ****
  int  roadmap_layer_is_visible (int layer);
  
! RoadMapPen roadmap_layer_get_pen (int layer, int pen_type);
  
  void roadmap_layer_adjust (void);
--- 35,39 ----
  int  roadmap_layer_is_visible (int layer);
  
! RoadMapPen roadmap_layer_get_pen (int layer, int pen_type);
  
  void roadmap_layer_adjust (void);

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libft libft.vcp,NONE,1.1

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libft

Added Files:
	libft.vcp 
Log Message:
Update evc4 project files.

--- NEW FILE: libft.vcp ---
# Microsoft eMbedded Visual Tools Project File - Name="libft" - Package Owner=<4>
# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
# ** DO NOT EDIT **

# TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304

CFG=libft - Win32 (WCE ARMV4) Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "libft.vcn".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "libft.vcn" CFG="libft - Win32 (WCE ARMV4) Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "libft - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
!MESSAGE "libft - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
!MESSAGE "libft - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Static Library")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
# PROP ATL_Project 2
CPP=clarm.exe

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ARMV4Rel"
# PROP BASE Intermediate_Dir "ARMV4Rel"
# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ARMV4Rel"
# PROP Intermediate_Dir "ARMV4Rel"
# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
# ADD CPP /nologo /W3 /I "../../../freetype/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c
# SUBTRACT CPP /YX
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "ARMV4Dbg"
# PROP BASE Intermediate_Dir "ARMV4Dbg"
# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "ARMV4Dbg"
# PROP Intermediate_Dir "ARMV4Dbg"
# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
# ADD CPP /nologo /W3 /Zi /Od /I "../../../freetype/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /M$(CECrtMTDebug) /c
# SUBTRACT CPP /YX
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ARMV4Profiler"
# PROP BASE Intermediate_Dir "ARMV4Profiler"
# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ARMV4Profiler"
# PROP Intermediate_Dir "ARMV4Profiler"
# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /W3 /Zi /I "../../../freetype/include" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /O2 /M$(CECrtMT) /c
# SUBTRACT CPP /YX
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo

!ENDIF 

# Begin Target

# Name "libft - Win32 (WCE ARMV4) Release"
# Name "libft - Win32 (WCE ARMV4) Debug"
# Name "libft - Win32 (WCE ARMV4) Profiler"
# Begin Group "Source Files"

# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=..\..\..\freetype\src\autofit\autofit.c
DEP_CPP_AUTOF=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\autofit\afangles.c"\
	"..\..\..\freetype\src\autofit\afdummy.c"\
	"..\..\..\freetype\src\autofit\afdummy.h"\
	"..\..\..\freetype\src\autofit\aferrors.h"\
	"..\..\..\freetype\src\autofit\afglobal.c"\
	"..\..\..\freetype\src\autofit\afglobal.h"\
	"..\..\..\freetype\src\autofit\afhints.c"\
	"..\..\..\freetype\src\autofit\afhints.h"\
	"..\..\..\freetype\src\autofit\aflatin.c"\
	"..\..\..\freetype\src\autofit\aflatin.h"\
	"..\..\..\freetype\src\autofit\afloader.c"\
	"..\..\..\freetype\src\autofit\afloader.h"\
	"..\..\..\freetype\src\autofit\afmodule.c"\
	"..\..\..\freetype\src\autofit\afmodule.h"\
	"..\..\..\freetype\src\autofit\aftypes.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\bdf\bdf.c
DEP_CPP_BDF_C=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\bdf\bdf.h"\
	"..\..\..\freetype\src\bdf\bdfdrivr.c"\
	"..\..\..\freetype\src\bdf\bdfdrivr.h"\
	"..\..\..\freetype\src\bdf\bdferror.h"\
	"..\..\..\freetype\src\bdf\bdflib.c"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\cff\cff.c
DEP_CPP_CFF_C=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\cff\cffcmap.c"\
	"..\..\..\freetype\src\cff\cffcmap.h"\
	"..\..\..\freetype\src\cff\cffdrivr.c"\
	"..\..\..\freetype\src\cff\cffdrivr.h"\
	"..\..\..\freetype\src\cff\cfferrs.h"\
	"..\..\..\freetype\src\cff\cffgload.c"\
	"..\..\..\freetype\src\cff\cffgload.h"\
	"..\..\..\freetype\src\cff\cffload.c"\
	"..\..\..\freetype\src\cff\cffload.h"\
	"..\..\..\freetype\src\cff\cffobjs.c"\
	"..\..\..\freetype\src\cff\cffobjs.h"\
	"..\..\..\freetype\src\cff\cffparse.c"\
	"..\..\..\freetype\src\cff\cffparse.h"\
	"..\..\..\freetype\src\cff\cfftoken.h"\
	"..\..\..\freetype\src\cff\cfftypes.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftbase.c
DEP_CPP_FTBAS=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\base\ftcalc.c"\
	"..\..\..\freetype\src\base\ftdbgmem.c"\
	"..\..\..\freetype\src\base\ftgloadr.c"\
	"..\..\..\freetype\src\base\ftmac.c"\
	"..\..\..\freetype\src\base\ftnames.c"\
	"..\..\..\freetype\src\base\ftobjs.c"\
	"..\..\..\freetype\src\base\ftoutln.c"\
	"..\..\..\freetype\src\base\ftrfork.c"\
	"..\..\..\freetype\src\base\ftstream.c"\
	"..\..\..\freetype\src\base\fttrigon.c"\
	"..\..\..\freetype\src\base\ftutil.c"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftbitmap.c
DEP_CPP_FTBIT=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\cache\ftcache.c

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftglyph.c
DEP_CPP_FTGLY=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\gzip\ftgzip.c
DEP_CPP_FTGZI=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\gzip\adler32.c"\
	"..\..\..\freetype\src\gzip\infblock.c"\
	"..\..\..\freetype\src\gzip\infblock.h"\
	"..\..\..\freetype\src\gzip\infcodes.c"\
	"..\..\..\freetype\src\gzip\infcodes.h"\
	"..\..\..\freetype\src\gzip\inffixed.h"\
	"..\..\..\freetype\src\gzip\inflate.c"\
	"..\..\..\freetype\src\gzip\inftrees.c"\
	"..\..\..\freetype\src\gzip\inftrees.h"\
	"..\..\..\freetype\src\gzip\infutil.c"\
	"..\..\..\freetype\src\gzip\infutil.h"\
	"..\..\..\freetype\src\gzip\zconf.h"\
	"..\..\..\freetype\src\gzip\zlib.h"\
	"..\..\..\freetype\src\gzip\zutil.c"\
	"..\..\..\freetype\src\gzip\zutil.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftinit.c
DEP_CPP_FTINI=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\lzw\ftlzw.c
DEP_CPP_FTLZW=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\lzw\zopen.c"\
	"..\..\..\freetype\src\lzw\zopen.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftmm.c

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\base\ftsystem.c
DEP_CPP_FTSYS=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\pcf\pcf.c
DEP_CPP_PCF_C=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\pcf\pcf.h"\
	"..\..\..\freetype\src\pcf\pcfdrivr.c"\
	"..\..\..\freetype\src\pcf\pcfdrivr.h"\
	"..\..\..\freetype\src\pcf\pcferror.h"\
	"..\..\..\freetype\src\pcf\pcfread.c"\
	"..\..\..\freetype\src\pcf\pcfread.h"\
	"..\..\..\freetype\src\pcf\pcfutil.c"\
	"..\..\..\freetype\src\pcf\pcfutil.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\pfr\pfr.c
DEP_CPP_PFR_C=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\pfr\pfrcmap.c"\
	"..\..\..\freetype\src\pfr\pfrcmap.h"\
	"..\..\..\freetype\src\pfr\pfrdrivr.c"\
	"..\..\..\freetype\src\pfr\pfrdrivr.h"\
	"..\..\..\freetype\src\pfr\pfrerror.h"\
	"..\..\..\freetype\src\pfr\pfrgload.c"\
	"..\..\..\freetype\src\pfr\pfrgload.h"\
	"..\..\..\freetype\src\pfr\pfrload.c"\
	"..\..\..\freetype\src\pfr\pfrload.h"\
	"..\..\..\freetype\src\pfr\pfrobjs.c"\
	"..\..\..\freetype\src\pfr\pfrobjs.h"\
	"..\..\..\freetype\src\pfr\pfrsbit.c"\
	"..\..\..\freetype\src\pfr\pfrsbit.h"\
	"..\..\..\freetype\src\pfr\pfrtypes.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\psaux\psaux.c
DEP_CPP_PSAUX=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\psaux\psauxerr.h"\
	"..\..\..\freetype\src\psaux\psauxmod.c"\
	"..\..\..\freetype\src\psaux\psauxmod.h"\
	"..\..\..\freetype\src\psaux\psobjs.c"\
	"..\..\..\freetype\src\psaux\psobjs.h"\
	"..\..\..\freetype\src\psaux\t1cmap.c"\
	"..\..\..\freetype\src\psaux\t1cmap.h"\
	"..\..\..\freetype\src\psaux\t1decode.c"\
	"..\..\..\freetype\src\psaux\t1decode.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\pshinter\pshinter.c
DEP_CPP_PSHIN=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\pshinter\pshalgo.c"\
	"..\..\..\freetype\src\pshinter\pshalgo.h"\
	"..\..\..\freetype\src\pshinter\pshglob.c"\
	"..\..\..\freetype\src\pshinter\pshglob.h"\
	"..\..\..\freetype\src\pshinter\pshmod.c"\
	"..\..\..\freetype\src\pshinter\pshnterr.h"\
	"..\..\..\freetype\src\pshinter\pshrec.c"\
	"..\..\..\freetype\src\pshinter\pshrec.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\psnames\psnames.c
DEP_CPP_PSNAM=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\psnames\psmodule.c"\
	"..\..\..\freetype\src\psnames\psmodule.h"\
	"..\..\..\freetype\src\psnames\psnamerr.h"\
	"..\..\..\freetype\src\psnames\pstables.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\raster\raster.c
DEP_CPP_RASTE=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\raster\ftmisc.h"\
	"..\..\..\freetype\src\raster\ftraster.c"\
	"..\..\..\freetype\src\raster\ftraster.h"\
	"..\..\..\freetype\src\raster\ftrend1.c"\
	"..\..\..\freetype\src\raster\ftrend1.h"\
	"..\..\..\freetype\src\raster\rasterrs.h"\
	
NODEP_CPP_RASTE=\
	"..\..\..\freetype\src\raster\ftimage.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\sfnt\sfnt.c
DEP_CPP_SFNT_=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\sfnt\sfdriver.c"\
	"..\..\..\freetype\src\sfnt\sfdriver.h"\
	"..\..\..\freetype\src\sfnt\sferrors.h"\
	"..\..\..\freetype\src\sfnt\sfobjs.c"\
	"..\..\..\freetype\src\sfnt\sfobjs.h"\
	"..\..\..\freetype\src\sfnt\ttcmap.c"\
	"..\..\..\freetype\src\sfnt\ttcmap.h"\
	"..\..\..\freetype\src\sfnt\ttkern.c"\
	"..\..\..\freetype\src\sfnt\ttkern.h"\
	"..\..\..\freetype\src\sfnt\ttload.c"\
	"..\..\..\freetype\src\sfnt\ttload.h"\
	"..\..\..\freetype\src\sfnt\ttpost.c"\
	"..\..\..\freetype\src\sfnt\ttpost.h"\
	"..\..\..\freetype\src\sfnt\ttsbit.c"\
	"..\..\..\freetype\src\sfnt\ttsbit.h"\
	"..\..\..\freetype\src\sfnt\ttsbit0.c"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\smooth\smooth.c

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\truetype\truetype.c
DEP_CPP_TRUET=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\truetype\ttdriver.c"\
	"..\..\..\freetype\src\truetype\ttdriver.h"\
	"..\..\..\freetype\src\truetype\tterrors.h"\
	"..\..\..\freetype\src\truetype\ttgload.c"\
	"..\..\..\freetype\src\truetype\ttgload.h"\
	"..\..\..\freetype\src\truetype\ttgxvar.c"\
	"..\..\..\freetype\src\truetype\ttgxvar.h"\
	"..\..\..\freetype\src\truetype\ttinterp.c"\
	"..\..\..\freetype\src\truetype\ttinterp.h"\
	"..\..\..\freetype\src\truetype\ttobjs.c"\
	"..\..\..\freetype\src\truetype\ttobjs.h"\
	"..\..\..\freetype\src\truetype\ttpload.c"\
	"..\..\..\freetype\src\truetype\ttpload.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\type1\type1.c
DEP_CPP_TYPE1=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\type1\t1afm.c"\
	"..\..\..\freetype\src\type1\t1afm.h"\
	"..\..\..\freetype\src\type1\t1driver.c"\
	"..\..\..\freetype\src\type1\t1driver.h"\
	"..\..\..\freetype\src\type1\t1errors.h"\
	"..\..\..\freetype\src\type1\t1gload.c"\
	"..\..\..\freetype\src\type1\t1gload.h"\
	"..\..\..\freetype\src\type1\t1load.c"\
	"..\..\..\freetype\src\type1\t1load.h"\
	"..\..\..\freetype\src\type1\t1objs.c"\
	"..\..\..\freetype\src\type1\t1objs.h"\
	"..\..\..\freetype\src\type1\t1parse.c"\
	"..\..\..\freetype\src\type1\t1parse.h"\
	"..\..\..\freetype\src\type1\t1tokens.h"\
	
# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\cid\type1cid.c
DEP_CPP_TYPE1C=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\cid\ciderrs.h"\
	"..\..\..\freetype\src\cid\cidgload.c"\
	"..\..\..\freetype\src\cid\cidgload.h"\
	"..\..\..\freetype\src\cid\cidload.c"\
	"..\..\..\freetype\src\cid\cidload.h"\
	"..\..\..\freetype\src\cid\cidobjs.c"\
	"..\..\..\freetype\src\cid\cidobjs.h"\
	"..\..\..\freetype\src\cid\cidparse.c"\
	"..\..\..\freetype\src\cid\cidparse.h"\
	"..\..\..\freetype\src\cid\cidriver.c"\
	"..\..\..\freetype\src\cid\cidriver.h"\
	"..\..\..\freetype\src\cid\cidtoken.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\type42\type42.c
DEP_CPP_TYPE4=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\type42\t42drivr.c"\
	"..\..\..\freetype\src\type42\t42drivr.h"\
	"..\..\..\freetype\src\type42\t42error.h"\
	"..\..\..\freetype\src\type42\t42objs.c"\
	"..\..\..\freetype\src\type42\t42objs.h"\
	"..\..\..\freetype\src\type42\t42parse.c"\
	"..\..\..\freetype\src\type42\t42parse.h"\
	"..\..\..\freetype\src\type42\t42types.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

# PROP BASE Exclude_From_Build 1
# PROP Exclude_From_Build 1

!ENDIF 

# End Source File
# Begin Source File

SOURCE=..\..\..\freetype\src\winfonts\winfnt.c
DEP_CPP_WINFN=\
	"..\..\..\freetype\include\freetype\config\ftheader.h"\
	"..\..\..\freetype\include\ft2build.h"\
	"..\..\..\freetype\src\winfonts\fnterrs.h"\
	"..\..\..\freetype\src\winfonts\winfnt.h"\
	

!IF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Release"

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Debug"

# PROP Exclude_From_Build 1

!ELSEIF  "$(CFG)" == "libft - Win32 (WCE ARMV4) Profiler"

!ENDIF 

# End Source File
# End Group
# Begin Group "Header Files"

# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# End Target
# End Project

[Roadmap-commit] roadmap_editor/src/win32/wince_env/libguiroadmap libguiroadmap.vcp,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libguiroadmap

Modified Files:
	libguiroadmap.vcp 
Log Message:
Update evc4 project files.

Index: libguiroadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** libguiroadmap.vcp	16 Dec 2005 14:43:20 -0000	1.2
--- libguiroadmap.vcp	23 Apr 2006 13:32:25 -0000	1.3
***************
*** 209,213 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
--- 209,213 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
***************
*** 371,374 ****
--- 371,375 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 378,381 ****
--- 379,383 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 400,403 ****
--- 402,406 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 407,410 ****
--- 410,414 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 437,440 ****
--- 441,445 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 596,599 ****
--- 601,605 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 604,607 ****
--- 610,614 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 628,631 ****
--- 635,639 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 636,639 ****
--- 644,648 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 669,672 ****
--- 678,682 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 912,915 ****
--- 922,926 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 920,923 ****
--- 931,935 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 944,947 ****
--- 956,960 ----
  	"..\..\..\roadmap_messagebox.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 952,955 ****
--- 965,969 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 985,988 ****
--- 999,1003 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1087,1090 ****
--- 1102,1106 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_message.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_street.h"\
***************
*** 1107,1110 ****
--- 1123,1127 ----
  	"..\..\..\roadmap_math.h"\
  	"..\..\..\roadmap_message.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_street.h"\
***************
*** 1262,1265 ****
--- 1279,1283 ----
  DEP_CPP_ROADMAP_DO=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_county.h"\
***************
*** 1285,1288 ****
--- 1303,1307 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1291,1294 ****
--- 1310,1314 ----
  DEP_CPP_ROADMAP_DO=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_county.h"\
***************
*** 1314,1317 ****
--- 1334,1338 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1344,1347 ****
--- 1365,1369 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1456,1459 ****
--- 1478,1482 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1477,1480 ****
--- 1500,1504 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1498,1501 ****
--- 1522,1526 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 1571,1580 ****
--- 1596,1608 ----
  DEP_CPP_ROADMAP_FU=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_fuzzy.h"\
+ 	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_line.h"\
  	"..\..\..\roadmap_locator.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 1586,1595 ****
--- 1614,1626 ----
  DEP_CPP_ROADMAP_FU=\
  	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_fuzzy.h"\
+ 	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_line.h"\
  	"..\..\..\roadmap_locator.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_types.h"\
***************
*** 1816,1823 ****
  # Begin Source File
  
! SOURCE=..\..\..\roadmap_layer.c
  
  !IF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Release"
  
  DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
--- 1847,1914 ----
  # Begin Source File
  
! SOURCE=..\..\..\roadmap_label.c
  
  !IF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Release"
  
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
+ 
+ DEP_CPP_ROADMAP_L=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_label.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug"
+ 
+ DEP_CPP_ROADMAP_L=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_label.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug"
+ 
+ DEP_CPP_ROADMAP_L=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_label.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release"
+ 
+ DEP_CPP_ROADMAP_L=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_label.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	
+ 
+ !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler"
+ 
  DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
***************
*** 1825,1828 ****
--- 1916,1940 ----
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_gui.h"\
+ 	"..\..\..\roadmap_label.h"\
+ 	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
+ 	"..\..\..\roadmap_types.h"\
+ 	"..\..\roadmap_win32.h"\
+ 	
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\..\roadmap_layer.c
+ 
+ !IF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Release"
+ 
+ DEP_CPP_ROADMAP_LA=\
+ 	"..\..\..\roadmap.h"\
+ 	"..\..\..\roadmap_canvas.h"\
+ 	"..\..\..\roadmap_config.h"\
+ 	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_math.h"\
***************
*** 1833,1837 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1945,1949 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 1846,1850 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1958,1962 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 1859,1863 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1971,1975 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 1872,1877 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_L=\
! 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1984,1988 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 1880,1883 ****
--- 1991,1995 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
***************
*** 1886,1891 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_L=\
! 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 1998,2002 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 1894,1897 ****
--- 2005,2009 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_math.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
***************
*** 1900,1904 ****
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_L=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 2012,2016 ----
  !ELSEIF  "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler"
  
! DEP_CPP_ROADMAP_LA=\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
***************
*** 2051,2054 ****
--- 2163,2167 ----
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_display.h"\
***************
*** 2060,2063 ****
--- 2173,2177 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 2066,2069 ****
--- 2180,2184 ----
  	"..\..\..\roadmap_navigate.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
***************
*** 2072,2075 ****
--- 2187,2191 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2082,2085 ****
--- 2198,2202 ----
  	"..\..\..\roadmap_config.h"\
  	"..\..\..\roadmap_db.h"\
+ 	"..\..\..\roadmap_db_line_route.h"\
  	"..\..\..\roadmap_dbread.h"\
  	"..\..\..\roadmap_display.h"\
***************
*** 2091,2094 ****
--- 2208,2212 ----
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
+ 	"..\..\..\roadmap_line_route.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 2097,2100 ****
--- 2215,2219 ----
  	"..\..\..\roadmap_navigate.h"\
  	"..\..\..\roadmap_net.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_serial.h"\
  	"..\..\..\roadmap_spawn.h"\
***************
*** 2103,2106 ****
--- 2222,2226 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2137,2140 ****
--- 2257,2261 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2241,2244 ****
--- 2362,2366 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2258,2261 ****
--- 2380,2384 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2275,2278 ****
--- 2398,2402 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2340,2343 ****
--- 2464,2468 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2358,2361 ****
--- 2483,2487 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2376,2379 ****
--- 2502,2506 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2619,2623 ****
  
  DEP_CPP_ROADMAP_S=\
- 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 2746,2749 ----
***************
*** 2627,2633 ****
--- 2753,2761 ----
  	"..\..\..\roadmap_display.h"\
  	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_fuzzy.h"\
  	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
***************
*** 2638,2641 ****
--- 2766,2770 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_object.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_point.h"\
  	"..\..\..\roadmap_pointer.h"\
***************
*** 2647,2654 ****
--- 2776,2785 ----
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_square.h"\
+ 	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_trip.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2656,2660 ****
  
  DEP_CPP_ROADMAP_S=\
- 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_canvas.h"\
--- 2787,2790 ----
***************
*** 2664,2670 ****
--- 2794,2802 ----
  	"..\..\..\roadmap_display.h"\
  	"..\..\..\roadmap_file.h"\
+ 	"..\..\..\roadmap_fuzzy.h"\
  	"..\..\..\roadmap_gps.h"\
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
***************
*** 2675,2678 ****
--- 2807,2811 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_object.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_point.h"\
  	"..\..\..\roadmap_pointer.h"\
***************
*** 2684,2691 ****
--- 2817,2826 ----
  	"..\..\..\roadmap_sprite.h"\
  	"..\..\..\roadmap_square.h"\
+ 	"..\..\..\roadmap_street.h"\
  	"..\..\..\roadmap_string.h"\
  	"..\..\..\roadmap_trip.h"\
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 2704,2707 ****
--- 2839,2843 ----
  	"..\..\..\roadmap_gui.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_layer.h"\
  	"..\..\..\roadmap_line.h"\
***************
*** 2727,2730 ****
--- 2863,2867 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3029,3033 ****
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
--- 3166,3173 ----
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\db\editor_db.h"\
! 	"..\..\..\editor\editor_main.h"\
! 	"..\..\..\editor\export\editor_export.h"\
! 	"..\..\..\navigate\navigate_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
***************
*** 3053,3056 ****
--- 3193,3197 ----
  	"..\..\..\roadmap_httpcopy.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 3062,3065 ****
--- 3203,3207 ----
  	"..\..\..\roadmap_object.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_preferences.h"\
***************
*** 3074,3077 ****
--- 3216,3220 ----
  	"..\..\..\roadmap_voice.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3079,3083 ****
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\editor_screen.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
--- 3222,3229 ----
  
  DEP_CPP_ROADMAP_ST=\
! 	"..\..\..\editor\db\editor_db.h"\
! 	"..\..\..\editor\editor_main.h"\
! 	"..\..\..\editor\export\editor_export.h"\
! 	"..\..\..\navigate\navigate_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
***************
*** 3103,3106 ****
--- 3249,3253 ----
  	"..\..\..\roadmap_httpcopy.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 3112,3115 ****
--- 3259,3263 ----
  	"..\..\..\roadmap_object.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_pointer.h"\
  	"..\..\..\roadmap_preferences.h"\
***************
*** 3124,3127 ****
--- 3272,3276 ----
  	"..\..\..\roadmap_voice.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3129,3134 ****
--- 3278,3285 ----
  
  DEP_CPP_ROADMAP_ST=\
+ 	"..\..\..\editor\db\editor_db.h"\
  	"..\..\..\editor\editor_main.h"\
  	"..\..\..\editor\export\editor_export.h"\
+ 	"..\..\..\navigate\navigate_main.h"\
  	"..\..\..\roadmap.h"\
  	"..\..\..\roadmap_address.h"\
***************
*** 3154,3157 ****
--- 3305,3309 ----
  	"..\..\..\roadmap_httpcopy.h"\
  	"..\..\..\roadmap_io.h"\
+ 	"..\..\..\roadmap_label.h"\
  	"..\..\..\roadmap_list.h"\
  	"..\..\..\roadmap_locator.h"\
***************
*** 3176,3179 ****
--- 3328,3332 ----
  	"..\..\..\roadmap_voice.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3333,3336 ****
--- 3486,3490 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 3343,3346 ****
--- 3497,3501 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3365,3368 ****
--- 3520,3524 ----
  	"..\..\..\roadmap_net.h"\
  	"..\..\..\roadmap_path.h"\
+ 	"..\..\..\roadmap_plugin.h"\
  	"..\..\..\roadmap_preferences.h"\
  	"..\..\..\roadmap_screen.h"\
***************
*** 3375,3378 ****
--- 3531,3535 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  
***************
*** 3408,3411 ****
--- 3565,3569 ----
  	"..\..\..\roadmap_types.h"\
  	"..\..\roadmap_win32.h"\
+ 	"..\..\win32_serial.h"\
  	
  

[Roadmap-commit] roadmap_editor/src/win32/wince_env/Roadmap Roadmap.vcp,1.2,1.3

[Ehud S. <esh...@us...>]

Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/Roadmap

Modified Files:
	Roadmap.vcp 
Log Message:
Update evc4 project files.

Index: Roadmap.vcp
===================================================================
RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap/Roadmap.vcp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Roadmap.vcp	16 Dec 2005 14:44:13 -0000	1.2
--- Roadmap.vcp	23 Apr 2006 13:32:24 -0000	1.3
***************
*** 52,70 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- RSC=rc.exe
- # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
- # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
- # ADD CPP /nologo /W3 /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE ARM) Debug"
--- 52,70 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  LINK32=link.exe
  # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+ # ADD CPP /nologo /W3 /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+ RSC=rc.exe
+ # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+ # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE ARM) Debug"
***************
*** 85,103 ****
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
- RSC=rc.exe
- # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
- # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
- CPP=clarm.exe
- # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
- # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
- MTL=midl.exe
- # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
- BSC32=bscmake.exe
- # ADD BASE BSC32 /nologo
- # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE x86) Release"
--- 85,103 ----
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  LINK32=link.exe
  # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
  # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+ BSC32=bscmake.exe
+ # ADD BASE BSC32 /nologo
+ # ADD BSC32 /nologo
+ MTL=midl.exe
+ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+ CPP=clarm.exe
+ # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+ # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+ RSC=rc.exe
+ # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+ # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
  
  !ELSEIF  "$(CFG)" == "Roadmap - Win32 (WCE x86) Release"
***************
*** 256,260 ****
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /fastcap /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 256,260 ----
  CPP=clarm.exe
  # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c
! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 406,415 ****
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
  	
  NODEP_CPP_ROADM=\
- 	".\inuserm.h"\
- 	".\ipapi.h"\
- 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 406,416 ----
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
+ 	"..\..\win32_serial.h"\
  	"..\..\wince_input_mon.h"\
+ 	{$(INCLUDE)}"aygshell.h"\
+ 	{$(INCLUDE)}"sipapi.h"\
+ 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADM=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
***************
*** 435,444 ****
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
  	"..\..\wince_input_mon.h"\
  	
  NODEP_CPP_ROADM=\
- 	".\inuserm.h"\
- 	".\ipapi.h"\
- 	".\ygshell.h"\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
--- 436,447 ----
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
+ 	"..\..\win32_serial.h"\
  	"..\..\wince_input_mon.h"\
+ 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
+ 	{$(INCLUDE)}"aygshell.h"\
+ 	{$(INCLUDE)}"sipapi.h"\
+ 	{$(INCLUDE)}"winuserm.h"\
  	
  NODEP_CPP_ROADM=\
  	"C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\
  	
***************
*** 464,468 ****
--- 467,473 ----
  	"..\..\roadmap_win32.h"\
  	"..\..\roadmap_wincecanvas.h"\
+ 	"..\..\win32_serial.h"\
  	"..\..\wince_input_mon.h"\
+ 	"C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\
  	{$(INCLUDE)}"aygshell.h"\
  	{$(INCLUDE)}"sipapi.h"\