You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: Ehud S. <esh...@us...> - 2007-02-09 17:29:19
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/c In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15814/j2me/c Added Files: Tag: BR-J2ME Makefile roadmap_canvas.c roadmap_file.c roadmap_main.c roadmap_path.c roadmap_serial.c roadmap_time.c stubs.c Log Message: OK, who wants to run RoadMap on his J2ME phone? This is an import of the RoadMap j2ME branch. --- NEW FILE: roadmap_time.c --- /* roadmap_time.c - Manage time information & display. * * LICENSE: * * Copyright 2002 Pascal F. Martin * * 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_time.h */ #include <string.h> #include <stdio.h> #include <stdlib.h> #include <time.h> #include "roadmap.h" #include "roadmap_time.h" char *roadmap_time_get_hours_minutes (time_t gmt) { return "00:00"; #if 0 static char image[16]; struct tm *tm; tm = localtime (&gmt); snprintf (image, sizeof(image), "%2d:%02d", tm->tm_hour, tm->tm_min); return image; #endif } --- NEW FILE: roadmap_path.c --- /* roadmap_path.c - a module to handle file path in an OS independent way. * * LICENSE: * * Copyright 2002 Pascal F. Martin * * 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_path.h. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "roadmap.h" #include "roadmap_file.h" #include "roadmap_path.h" typedef struct RoadMapPathRecord *RoadMapPathList; struct RoadMapPathRecord { RoadMapPathList next; char *name; int count; char **items; char *preferred; }; static RoadMapPathList RoadMapPaths = NULL; /* This list exist because the user context is a special case * that we want to handle in a standard way. */ static const char *RoadMapPathUser[] = { ".", "./roadmap", NULL }; static const char *RoadMapPathUserPreferred = "./roadmap"; /* Skins directories */ static const char *RoadMapPathSkin[] = { ".", "./roadmap/skins/default/day", "./roadmap/skins/default", NULL }; static const char *RoadMapPathSkinPreferred = "./roadmap/skins"; /* The hardcoded path for configuration files (the "config" path). * (Note that the user directory (~/.roadmap) does not appear here * as it is implicitely used by the callers--see above.) */ static const char *RoadMapPathConfig[] = { /* This is for standard Unix configurations. */ ".", "./roadmap", NULL }; static const char *RoadMapPathConfigPreferred = "./roadmap"; /* The default path for the map files (the "maps" path): */ static const char *RoadMapPathMaps[] = { /* This is for standard Unix configurations. */ ".", "./roadmap/maps", NULL }; static const char *RoadMapPathMapsPreferred = "./roadmap/maps"; static char *roadmap_path_expand (const char *item, size_t length); static void roadmap_path_list_create(const char *name, const char *items[], const char *preferred) { size_t i; size_t count; RoadMapPathList new_path; for (count = 0; items[count] != NULL; ++count) ; new_path = malloc (sizeof(struct RoadMapPathRecord)); roadmap_check_allocated(new_path); new_path->next = RoadMapPaths; new_path->name = strdup(name); new_path->count = (int)count; new_path->items = calloc (count, sizeof(char *)); roadmap_check_allocated(new_path->items); for (i = 0; i < count; ++i) { new_path->items[i] = roadmap_path_expand (items[i], strlen(items[i])); } new_path->preferred = roadmap_path_expand (preferred, strlen(preferred)); RoadMapPaths = new_path; } static RoadMapPathList roadmap_path_find (const char *name) { RoadMapPathList cursor; if (RoadMapPaths == NULL) { /* Add the hardcoded configuration. */ roadmap_path_list_create ("user", RoadMapPathUser, RoadMapPathUserPreferred); roadmap_path_list_create ("config", RoadMapPathConfig, RoadMapPathConfigPreferred); roadmap_path_list_create ("skin", RoadMapPathSkin, RoadMapPathSkinPreferred); roadmap_path_list_create ("maps", RoadMapPathMaps, RoadMapPathMapsPreferred); } for (cursor = RoadMapPaths; cursor != NULL; cursor = cursor->next) { if (strcasecmp(cursor->name, name) == 0) break; } return cursor; } /* Directory path strings operations. -------------------------------------- */ static char *roadmap_path_cat (const char *s1, const char *s2) { char *result = malloc (strlen(s1) + strlen(s2) + 4); roadmap_check_allocated (result); strcpy (result, s1); strcat (result, "/"); strcat (result, s2); return result; } char *roadmap_path_join (const char *path, const char *name) { if (path == NULL) { return strdup (name); } return roadmap_path_cat (path, name); } char *roadmap_path_parent (const char *path, const char *name) { char *separator; char *full_name = roadmap_path_join (path, name); separator = strrchr (full_name, '/'); if (separator == NULL) { return "."; } *separator = 0; return full_name; } char *roadmap_path_skip_directories (const char *name) { char *result = strrchr (name, '/'); if (result == NULL) return (char *)name; return result + 1; } char *roadmap_path_remove_extension (const char *name) { char *result; char *p; result = strdup(name); roadmap_check_allocated(result); p = roadmap_path_skip_directories (result); p = strrchr (p, '.'); if (p != NULL) *p = 0; return result; } /* The standard directory paths: ------------------------------------------- */ static const char *roadmap_path_home (void) { return "."; } const char *roadmap_path_user (void) { static char *RoadMapUser = NULL; if (RoadMapUser == NULL) { RoadMapUser = roadmap_path_cat (roadmap_path_home(), "/roadmap"); } return RoadMapUser; } const char *roadmap_path_trips (void) { static char RoadMapDefaultTrips[] = ".roadmap/trips"; static char *RoadMapTrips = NULL; if (RoadMapTrips == NULL) { RoadMapTrips = roadmap_path_cat (roadmap_path_home(), RoadMapDefaultTrips); } return RoadMapTrips; } static char *roadmap_path_expand (const char *item, size_t length) { const char *expansion; size_t expansion_length; char *expanded; switch (item[0]) { case '~': expansion = roadmap_path_home(); item++; length--; break; case '&': expansion = roadmap_path_user(); item++; length--; break; default: expansion = ""; } expansion_length = strlen(expansion); expanded = malloc (length + expansion_length + 1); roadmap_check_allocated(expanded); strcpy (expanded, expansion); strncat (expanded, item, length); expanded[length+expansion_length] = 0; return expanded; } /* Path lists operations. -------------------------------------------------- */ void roadmap_path_set (const char *name, const char *path) { int i; size_t count; const char *item; const char *next_item; RoadMapPathList path_list = roadmap_path_find (name); if (path_list == NULL) { roadmap_log(ROADMAP_FATAL, "unknown path set '%s'", name); } while (*path == ',') path += 1; if (*path == 0) return; /* Ignore empty path: current is better. */ if (path_list->items != NULL) { /* This replaces a path that was already set. */ for (i = path_list->count-1; i >= 0; --i) { free (path_list->items[i]); } free (path_list->items); } /* Count the number of items in this path string. */ count = 0; for (item = path-1; item != NULL; item = strchr (item+1, ',')) { count += 1; } path_list->items = calloc (count, sizeof(char *)); roadmap_check_allocated(path_list->items); /* Extract and expand each item of the path. * Ignore directories that do not exist yet. */ for (i = 0, item = path-1; item != NULL; item = next_item) { item += 1; next_item = strchr (item, ','); if (next_item == NULL) { path_list->items[i] = roadmap_path_expand (item, strlen(item)); } else { path_list->items[i] = roadmap_path_expand (item, (size_t)(next_item - item)); } if (roadmap_file_exists(NULL, path_list->items[i])) { ++i; } else { free (path_list->items[i]); path_list->items[i] = NULL; } } path_list->count = i; } const char *roadmap_path_first (const char *name) { RoadMapPathList path_list = roadmap_path_find (name); if (path_list == NULL) { roadmap_log (ROADMAP_FATAL, "invalid path set '%s'", name); } if (path_list->count > 0) { return path_list->items[0]; } return NULL; } const char *roadmap_path_next (const char *name, const char *current) { int i; RoadMapPathList path_list = roadmap_path_find (name); for (i = 0; i < path_list->count-1; ++i) { if (path_list->items[i] == current) { return path_list->items[i+1]; } } return NULL; } const char *roadmap_path_last (const char *name) { RoadMapPathList path_list = roadmap_path_find (name); if (path_list == NULL) { roadmap_log (ROADMAP_FATAL, "invalid path set '%s'", name); } if (path_list->count > 0) { return path_list->items[path_list->count-1]; } return NULL; } const char *roadmap_path_previous (const char *name, const char *current) { int i; RoadMapPathList path_list = roadmap_path_find (name); for (i = path_list->count-1; i > 0; --i) { if (path_list->items[i] == current) { return path_list->items[i-1]; } } return NULL; } /* This function always return a hardcoded default location, * which is the recommended location for these objects. */ const char *roadmap_path_preferred (const char *name) { RoadMapPathList path_list = roadmap_path_find (name); if (path_list == NULL) { roadmap_log (ROADMAP_FATAL, "invalid path set '%s'", name); } return path_list->preferred; } void roadmap_path_create (const char *path) { } static char *RoadMapPathEmptyList = NULL; char **roadmap_path_list (const char *path, const char *extension) { return &RoadMapPathEmptyList; } void roadmap_path_list_free (char **list) { char **cursor; if ((list == NULL) || (list == &RoadMapPathEmptyList)) return; for (cursor = list; *cursor != NULL; ++cursor) { free (*cursor); } free (list); } void roadmap_path_free (const char *path) { free ((char *) path); } const char *roadmap_path_search_icon (const char *name) { static char result[256]; sprintf (result, "%s/pixmaps/rm_%s.png", roadmap_path_home(), name); if (roadmap_file_exists(NULL, result)) return result; sprintf (result, "/usr/local/share/pixmaps/rm_%s.png", name); if (roadmap_file_exists(NULL, result)) return result; sprintf (result, "/usr/share/pixmaps/rm_%s.png", name); if (roadmap_file_exists(NULL, result)) return result; return NULL; /* Not found. */ } int roadmap_path_is_full_path (const char *name) { return name[0] == '/'; } int roadmap_path_is_directory (const char *name) { return 0; } const char *roadmap_path_temporary (void) { return "/tmp"; } --- NEW FILE: roadmap_serial.c --- /* roadmap_serial.c - a module to open/read/close a serial IO device. * * 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 * * * DESCRIPTION: * * This module hides the OS specific API to access a serial device. * NOT IMPLEMENTED YET. */ #include "roadmap.h" #include "roadmap_serial.h" #include <gps_manager.h> static NOPH_GpsManager_t gps_mgr; RoadMapSerial roadmap_serial_open (const char *name, const char *mode, int speed) { if (!gps_mgr) { gps_mgr = NOPH_GpsManager_getInstance(); } return NOPH_GpsManager_connect (gps_mgr, name); } int roadmap_serial_read (RoadMapSerial serial, void *data, int size) { if (!gps_mgr) return -1; return NOPH_GpsManager_read (gps_mgr, data, size); } int roadmap_serial_write (RoadMapSerial serial, const void *data, int length) { return -1; } void roadmap_serial_close (RoadMapSerial serial) { if (!gps_mgr) return; NOPH_GpsManager_disconnect (gps_mgr); } --- NEW FILE: Makefile --- ###################################################################### ## ## Copyright (C) 2006, Blekinge Institute of Technology ## ## Filename: Makefile ## Author: Simon Kagstrom <sk...@bt...> ## Description: Generic Makefile ## ## $Id: Makefile,v 1.1.2.1 2007/02/09 17:29:09 eshabtai Exp $ ## ###################################################################### SUBDIRS = TARGET = program OBJS = ../../src/roadmap_dbread.o \ ../../src/roadmap_line.o \ ../../src/roadmap_log.o \ ../../src/roadmap_line_route.o \ ../../src/roadmap_line_speed.o \ ../../src/roadmap_turns.o \ ../../src/roadmap_dictionary.o \ ../../src/roadmap_math.o \ ../../src/roadmap_point.o \ ../../src/roadmap_polygon.o \ ../../src/roadmap_shape.o \ ../../src/roadmap_square.o \ ../../src/roadmap_config.o \ ../../src/roadmap_state.o \ ../../src/roadmap_layer.o \ ../../src/roadmap_street.o \ ../../src/roadmap_county.o \ ../../src/roadmap_locator.o \ ../../src/roadmap_metadata.o \ ../../src/roadmap_skin.o \ ../../src/roadmap_plugin.o \ ../../src/roadmap_hash.o \ ../../src/roadmap_list.o \ ../../src/roadmap_option.o \ ../../src/roadmap_display.o \ ../../src/roadmap_message.o \ ../../src/roadmap_sprite.o \ ../../src/roadmap_label.o \ ../../src/roadmap_object.o \ ../../src/roadmap_string.o \ ../../src/roadmap_lang.o \ ../../src/roadmap_adjust.o \ ../../src/roadmap_trip.o \ ../../src/roadmap_screen.o \ ../../src/roadmap_factory.o \ ../../src/roadmap_navigate.o \ ../../src/roadmap_fuzzy.o \ ../../src/roadmap_start.o \ ../../src/roadmap_screen_obj.o \ ../../src/roadmap_gps.o \ ../../src/roadmap_nmea.o \ ../../src/roadmap_input.o \ ../../src/roadmap_io.o \ ./roadmap_path.o \ ./roadmap_file.o \ ./roadmap_canvas.o \ ./roadmap_time.o \ ./roadmap_serial.o \ ./roadmap_main.o \ ./stubs.o \ # ../../src/roadmap_screen.o \ ../../src/roadmap_trip.o \ LDLIBS = -lc -lsoftfloat -lm CFLAGS = -I../../src -DJ2ME CIBYL_MIPS2JAVA_OPTS ?= include $(CIBYL_BASE)/build/Rules.mk --- NEW FILE: stubs.c --- /* roadmap_log.c - a module for managing uniform error & info messages. * * LICENSE: * * Copyright 2002 Pascal F. Martin * * 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: * * #include "roadmap.h" * * void roadmap_log (int level, char *format, ...); * * This module is used to control and manage the appearance of messages * printed by the roadmap program. The goals are (1) to produce a uniform * look, (2) have a central point of control for error management and * (3) have a centralized control for routing messages. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> #include <time.h> #include "roadmap.h" #include "roadmap_path.h" #include "roadmap_net.h" #include "roadmap_serial.h" #include "roadmap_spawn.h" #include "roadmap_file.h" int roadmap_net_receive (RoadMapSocket s, void *data, int size) { return -1; } int roadmap_net_send (RoadMapSocket s, const void *data, int length, int wait) { return -1; } void roadmap_net_close (RoadMapSocket s) {} int roadmap_spawn_write_pipe (RoadMapPipe pipe, const void *data, int length) { return -1; } int roadmap_spawn_read_pipe (RoadMapPipe pipe, void *data, int size) { return -1; } void roadmap_spawn_close_pipe (RoadMapPipe pipe) {} --- NEW FILE: roadmap_file.c --- /* roadmap_file.c - a module to open/read/close a roadmap database file. * * LICENSE: * * Copyright 2002 Pascal F. Martin * * 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_file.h. */ #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "roadmap.h" #include "roadmap_path.h" #include "roadmap_file.h" struct RoadMapFileContextStructure { FILE *fd; void *base; int size; }; FILE *roadmap_file_fopen (const char *path, const char *name, const char *mode) { int silent; FILE *file; const char *full_name = roadmap_path_join (path, name); if (mode[0] == 's') { /* This special mode is a "lenient" read: do not complain * if the file does not exist. */ silent = 1; ++mode; } else { silent = 0; } file = fopen (full_name, mode); roadmap_log (ROADMAP_DEBUG, "After fopen for: %s, file=%x", full_name, file); if ((file == NULL) && (! silent)) { roadmap_log (ROADMAP_ERROR, "cannot open file %s", full_name); } roadmap_path_free (full_name); return file; } void roadmap_file_remove (const char *path, const char *name) { assert("roadmap_file_remove"); const char *full_name = roadmap_path_join (path, name); //remove(full_name); roadmap_path_free (full_name); } int roadmap_file_exists (const char *path, const char *name) { int status; const char *full_name = roadmap_path_join (path, name); FILE *f = fopen (full_name, "r"); status = (f != NULL); if (f) fclose(f); return status; } /* int roadmap_file_length (const char *path, const char *name) { int status; const char *full_name = roadmap_path_join (path, name); struct stat stat_buffer; status = stat (full_name, &stat_buffer); roadmap_path_free (full_name); if (status == 0) { return stat_buffer.st_size; } return -1; } void roadmap_file_save (const char *path, const char *name, void *data, int length) { int fd; const char *full_name = roadmap_path_join (path, name); fd = open (full_name, O_CREAT+O_WRONLY+O_TRUNC, 0666); roadmap_path_free (full_name); if (fd >= 0) { write (fd, data, length); close(fd); } } int roadmap_file_truncate (const char *path, const char *name, int length) { int res; const char *full_name = roadmap_path_join (path, name); res = truncate (full_name, length); roadmap_path_free (full_name); return res; } void roadmap_file_append (const char *path, const char *name, void *data, int length) { int fd; const char *full_name = roadmap_path_join (path, name); fd = open (full_name, O_CREAT+O_WRONLY+O_APPEND, 0666); roadmap_path_free (full_name); if (fd >= 0) { write (fd, data, length); close(fd); } } const char *roadmap_file_unique (const char *base) { static int UniqueNameCounter = 0; static char *UniqueNameBuffer = NULL; static int UniqueNameBufferLength = 0; int length; length = strlen(base + 16); if (length > UniqueNameBufferLength) { if (UniqueNameBuffer != NULL) { free(UniqueNameBuffer); } UniqueNameBuffer = malloc (length); roadmap_check_allocated(UniqueNameBuffer); UniqueNameBufferLength = length; } sprintf (UniqueNameBuffer, "%s%d_%d", base, getpid(), UniqueNameCounter); UniqueNameCounter += 1; return UniqueNameBuffer; } */ const char *roadmap_file_map (const char *set, const char *name, const char *sequence, const char *mode, RoadMapFileContext *file) { RoadMapFileContext context; context = malloc (sizeof(*context)); roadmap_check_allocated(context); context->fd = NULL; context->base = NULL; context->size = 0; if (strcmp(mode, "r")) { roadmap_log (ROADMAP_ERROR, "%s: invalid file access mode %s", name, mode); free (context); return NULL; } if (name[0] == '/') { context->fd = fopen (name, mode); sequence = ""; /* Whatever, but NULL. */ } else { char *full_name; int full_name_size; int name_size = strlen(name); int size; if (sequence == NULL) { sequence = roadmap_path_first(set); } else { sequence = roadmap_path_next(set, sequence); } if (sequence == NULL) { free (context); return NULL; } full_name_size = 512; full_name = malloc (full_name_size); roadmap_check_allocated(full_name); do { size = strlen(sequence) + name_size + 2; if (size >= full_name_size) { full_name = realloc (full_name, size); roadmap_check_allocated(full_name); full_name_size = size; } strcpy (full_name, sequence); strcat (full_name, "/"); strcat (full_name, name); context->fd = fopen (full_name, mode); if (context->fd > 0) break; sequence = roadmap_path_next(set, sequence); } while (sequence != NULL); free (full_name); } if (context->fd <= 0) { if (sequence == 0) { roadmap_log (ROADMAP_INFO, "cannot open file %s", name); } roadmap_file_unmap (&context); return NULL; } if ((context->size = favail(context->fd)) <= 0) { roadmap_file_unmap (&context); return NULL; } context->base = malloc(context->size); if ((context->base == NULL) || (fread(context->base, context->size, 1, context->fd) != context->size)) { roadmap_log (ROADMAP_ERROR, "cannot map file %s", name); roadmap_file_unmap (&context); return NULL; } *file = context; return sequence; /* Indicate the next directory in the path. */ } void *roadmap_file_base (RoadMapFileContext file){ if (file == NULL) { return NULL; } return file->base; } int roadmap_file_size (RoadMapFileContext file){ if (file == NULL) { return 0; } return file->size; } int roadmap_file_sync (RoadMapFileContext file) { return 0; } void roadmap_file_unmap (RoadMapFileContext *file) { RoadMapFileContext context = *file; if (context->base != NULL) { free(context->base); context->base = NULL; } if (context->fd > 0) { fclose (context->fd); } free(context); *file = NULL; } RoadMapFile roadmap_file_open (const char *name, const char *mode) { return -1; } int roadmap_file_read (RoadMapFile file, void *data, int size) { return -1; } int roadmap_file_write (RoadMapFile file, const void *data, int length) { return -1; } void roadmap_file_close (RoadMapFile file) { } int roadmap_file_free_space (const char *path) { return -1; } --- NEW FILE: roadmap_canvas.c --- /* roadmap_canvas.c - manage the canvas that is used to draw the map with j2me * * LICENSE: * * Copyright 2007 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 <string.h> #include <stdlib.h> #include <ctype.h> #include <javax/microedition/lcdui.h> #include <javax/microedition/lcdui/game.h> #include <jmicropolygon.h> #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" struct roadmap_canvas_pen { struct roadmap_canvas_pen *next; char *name; unsigned char color[3]; int thickness; }; static struct roadmap_canvas_pen *RoadMapPenList = NULL; static RoadMapPen CurrentPen = 0; static NOPH_GameCanvas_t canvas = 0; static NOPH_Graphics_t graphics = 0; static NOPH_Graphics_t graphicsBuffer = 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 size, int *width, int *ascent, int *descent, int *can_tilt) { *width = 0; *ascent = 0; *descent = 0; *can_tilt = 0; return; #if 0 *ascent = 0; *descent = 0; if (can_tilt) *can_tilt = 1; 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; font_manager_type *fman; if (size == -1) { /* Use the regular font */ *descent = abs((int)m_feng.descender()) + 1; *ascent = (int)m_feng.ascender() + 1; fman = &m_fman; } else { m_image_feng.height(size); m_image_feng.width(size); *descent = abs((int)m_image_feng.descender()) + 1; *ascent = (int)m_image_feng.ascender() + 1; fman = &m_image_fman; } while(*p) { const agg::glyph_cache* glyph = 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; #endif } RoadMapPen roadmap_canvas_select_pen (RoadMapPen pen) { RoadMapPen old_pen = CurrentPen; dbg_time_start(DBG_TIME_SELECT_PEN); CurrentPen = pen; if (graphicsBuffer) NOPH_Graphics_setColor (graphicsBuffer, pen->color[0], pen->color[1], pen->color[2]); dbg_time_end(DBG_TIME_SELECT_PEN); return old_pen; } 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); memset (&pen->color, 0, sizeof(pen->color)); pen->thickness = 1; pen->next = RoadMapPenList; RoadMapPenList = pen; } roadmap_canvas_select_pen (pen); return pen; } void roadmap_canvas_set_foreground (const char *color) { int i; if (!CurrentPen) return; if (*color != '#') return; color++; for (i=0; i<3; i++) { int val = 0; int j; for (j=0; j<2; j++) { val = val * 16; if (isdigit(color[j])) val += color[j] - 48; else val += (tolower(color[j]) - 87); } CurrentPen->color[i] = val; color += 2; } roadmap_canvas_select_pen(CurrentPen); } int roadmap_canvas_get_thickness (RoadMapPen pen) { if (pen == NULL) return 0; return pen->thickness; } void roadmap_canvas_set_thickness (int thickness) { if (CurrentPen && (CurrentPen->thickness != thickness)) { CurrentPen->thickness = thickness; } } void roadmap_canvas_set_opacity (int opacity) { return; #if 0 if (!CurrentPen) return; CurrentPen->color.a = opacity; roadmap_canvas_select_pen(CurrentPen); #endif } void roadmap_canvas_erase (void) { roadmap_log (ROADMAP_DEBUG, "in roadmap_canvas_erase: canvas: 0x%x\n", canvas); NOPH_Graphics_fillRect (graphicsBuffer, 0, 0, NOPH_GameCanvas_getWidth(canvas), NOPH_GameCanvas_getHeight(canvas)); } void roadmap_canvas_erase_area (const RoadMapGuiRect *rect) { NOPH_Graphics_fillRect (graphicsBuffer, rect->minx, rect->miny, rect->maxx, rect->maxy); } void roadmap_canvas_draw_string (RoadMapGuiPoint *position, int corner, const char *text) { return; #if 0 int x; int y; int text_width; int text_ascent; int text_descent; int text_height; roadmap_canvas_get_text_extents (text, -1, &text_width, &text_ascent, &text_descent, NULL); 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, -1, text); #endif } void roadmap_canvas_draw_multiple_points (int count, RoadMapGuiPoint *points) { int i; for (i=0; i<count; i++) { NOPH_Graphics_drawLine (graphicsBuffer, points[i].x, points[i].y, points[i].x, points[i].y); } } void roadmap_canvas_draw_multiple_lines (int count, int *lines, RoadMapGuiPoint *points, int fast_draw) { int i; dbg_time_start(DBG_TIME_DRAW_LINES); for (i = 0; i < count; ++i) { int count_of_points = *lines; int j; if (count_of_points < 2) continue; roadmap_log (ROADMAP_DEBUG, "Drawing a line:\n"); for (j=0; j<count_of_points-1; j++) { RoadMapGuiPoint *to_point = points+1; roadmap_log (ROADMAP_DEBUG, "From: %d,%d To %d,%d\n", points->x, points->y, to_point->x, to_point->y); NOPH_Graphics_drawLine (graphicsBuffer, points->x, points->y, to_point->x, to_point->y); points++; } points++; lines += 1; } 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; int *x_points = NULL; int *y_points = NULL; int array_size = 0; for (i = 0; i < count; ++i) { int j; count_of_points = *polygons; if (array_size < count_of_points) { array_size = count_of_points; if (x_points) { free(x_points); free(y_points); } x_points = malloc(count_of_points * sizeof(int)); y_points = malloc(count_of_points * sizeof(int)); } for (j=0; j<count_of_points; j++) { x_points[j] = points->x; y_points[j] = points->y; points++; } if (filled) { NOPH_PolygonGraphics_fillPolygon (graphicsBuffer, x_points, y_points, count_of_points); } else { NOPH_PolygonGraphics_drawPolygon (graphicsBuffer, x_points, y_points, count_of_points); } polygons += 1; } if (x_points) { free(x_points); free(y_points); } } void roadmap_canvas_draw_multiple_circles (int count, RoadMapGuiPoint *centers, int *radius, int filled, int fast_draw) { int i; for (i = 0; i < count; ++i) { int r = radius[i]; int x = centers[i].x - r; int y = centers[i].y - r; r *= 2; roadmap_log (ROADMAP_DEBUG, "circle: x:%d, y:%d, r:%d, filled:%d\n", x, y, r, filled); if (filled) { NOPH_Graphics_fillArc (graphicsBuffer, x, y, r, r, 0, 360); } else { NOPH_Graphics_drawArc (graphicsBuffer, x, y, r, r, 0, 360); } } } 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 NOPH_GameCanvas_getWidth (canvas); } int roadmap_canvas_height (void) { return NOPH_GameCanvas_getHeight (canvas); } void roadmap_canvas_save_screenshot (const char* filename) { /* NOT IMPLEMENTED. */ } void roadmap_canvas_draw_string_angle (const RoadMapGuiPoint *position, RoadMapGuiPoint *center, int angle, int size, const char *text) { return; #if 0 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(CurrentPen->color); dbg_time_end(DBG_TIME_TEXT_CNV); double x = 0; double y = 0; if ((angle > -5) && (angle < 5)) { if (size < 0) size = 15; /* Use faster drawing for text with no angle */ x = position->x; y = position->y; // ren_solid.color(agg::rgba8(0, 0, 0)); m_image_feng.height(size); m_image_feng.width(size); while(*p) { const agg::glyph_cache* glyph = m_image_fman.glyph(*p); if(glyph) { m_image_fman.init_embedded_adaptors(glyph, x, y); agg::render_scanlines(m_image_fman.gray8_adaptor(), m_image_fman.gray8_scanline(), ren_solid); // increment pen position x += glyph->advance_x; y += glyph->advance_y; } ++p; } } 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_contour<agg::conv_transform<font_manager_type::path_adaptor_type> >contour(tr); //contour.width(2); //agg::conv_stroke< agg::conv_contour<agg::conv_transform<font_manager_type::path_adaptor_type> > > stroke(contour); //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.reset(); ras.add_path(tr); agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(fill); //ras.add_path(stroke); //ren_solid.color(agg::rgba8(255, 255, 255)); //agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(tr); //ren_solid.color(agg::rgba8(0, 0, 0)); //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); #endif } RoadMapImage roadmap_canvas_load_image (const char *path, const char* file_name) { return NULL; } void roadmap_canvas_free_image (RoadMapImage image) { return; } void roadmap_canvas_draw_image (RoadMapImage image, const RoadMapGuiPoint *pos, int opacity, int mode) { return; #if 0 if ((mode == IMAGE_SELECTED) || (opacity <= 0) || (opacity >= 255)) { opacity = 255; } agg_renb.blend_from(image->pixfmt, 0, pos->x, pos->y, opacity); if (mode == IMAGE_SELECTED) { static RoadMapPen selection; if (!selection) { selection = roadmap_canvas_create_pen("selection"); roadmap_canvas_set_foreground ("#000000"); } RoadMapGuiPoint points[5] = { {pos->x, pos->y}, {pos->x + image->rbuf.width(), pos->y}, {pos->x + image->rbuf.width(), pos->y + image->rbuf.height()}, {pos->x, pos->y + image->rbuf.height()}, {pos->x, pos->y}}; int num_points = 5; RoadMapPen current = roadmap_canvas_select_pen (selection); roadmap_canvas_draw_multiple_lines (1, &num_points, points, 0); roadmap_canvas_select_pen (current); } #endif } void roadmap_canvas_copy_image (RoadMapImage dst_image, const RoadMapGuiPoint *pos, const RoadMapGuiRect *rect, RoadMapImage src_image, int mode) { return; #if 0 agg::renderer_base<agg::pixfmt_rgba32> renb(dst_image->pixfmt); agg::rect_i agg_rect; agg::rect_i *agg_rect_p = NULL; if (rect) { agg_rect.x1 = rect->minx; agg_rect.y1 = rect->miny; agg_rect.x2 = rect->maxx; agg_rect.y2 = rect->maxy; agg_rect_p = &agg_rect; } if (mode == CANVAS_COPY_NORMAL) { renb.copy_from(src_image->rbuf, agg_rect_p, pos->x, pos->y); } else { renb.blend_from(src_image->pixfmt, agg_rect_p, pos->x, pos->y, 255); } #endif } int roadmap_canvas_image_width (const RoadMapImage image) { return 0; } int roadmap_canvas_image_height (const RoadMapImage image) { return 0; } void roadmap_canvas_draw_image_text (RoadMapImage image, const RoadMapGuiPoint *position, int size, const char *text) { return; #if 0 if (RoadMapCanvasFontLoaded != 1) return; 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 double x = position->x; double y = position->y + size - 7; agg::renderer_base<agg::pixfmt_rgba32> renb(image->pixfmt); agg::renderer_scanline_aa_solid< agg::renderer_base<agg::pixfmt_rgba32> > ren_solid (renb); ren_solid.color(agg::rgba8(0, 0, 0)); m_image_feng.height(size); m_image_feng.width(size); while(*p) { const agg::glyph_cache* glyph = m_image_fman.glyph(*p); if(glyph) { m_image_fman.init_embedded_adaptors(glyph, x, y); agg::render_scanlines(m_image_fman.gray8_adaptor(), m_image_fman.gray8_scanline(), ren_solid); // increment pen position x += glyph->advance_x; y += glyph->advance_y; } ++p; } #ifdef USE_FRIBIDI free(bidi_text); #endif #endif } #if 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); } #endif void roadmap_canvas_refresh (void) { dbg_time_start(DBG_TIME_FLIP); if (graphics != graphicsBuffer) { } NOPH_GameCanvas_flushGraphics(canvas); dbg_time_end(DBG_TIME_FLIP); } void roadmap_canvas_configure (void) { roadmap_log (ROADMAP_DEBUG, "***** In roadmap_canvas_configure *****\n"); canvas = NOPH_GameCanvas_get(); graphics = NOPH_GameCanvas_getGraphics(canvas); graphicsBuffer = graphics; (*RoadMapCanvasConfigure) (); } --- NEW FILE: roadmap_main.c --- /* roadmap_main.c - The main function of the RoadMap application. * * LICENSE: * * Copyright 2007 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: * * int main (int argc, char **argv); */ #include <java/lang.h> #include <javax/microedition/lcdui.h> #include <javax/microedition/lcdui/game.h> #include <command_mgr.h> #include <gps_manager.h> #include <stdlib.h> #include <string.h> #include "roadmap.h" #include "roadmap_path.h" #include "roadmap_start.h" #include "roadmap_config.h" #include "roadmap_history.h" #include "roadmap_canvas.h" #include "roadmap_main.h" extern void roadmap_canvas_configure (void); struct roadmap_main_io { int id; RoadMapIO io; RoadMapInput callback; }; #define ROADMAP_MAX_IO 16 static struct roadmap_main_io RoadMapMainIo[ROADMAP_MAX_IO]; struct roadmap_main_timer { int id; RoadMapCallback callback; }; #define ROADMAP_MAX_TIMER 16 static struct roadmap_main_timer RoadMapMainPeriodicTimer[ROADMAP_MAX_TIMER]; static char *RoadMapMainTitle = NULL; static RoadMapKeyInput RoadMapMainInput = NULL; volatile static int command_addr = 0; static NOPH_GpsManager_t gps_mgr = 0; static void roadmap_start_event (int event) { switch (event) { case ROADMAP_START_INIT: break; } } static void roadmap_main_process_key (int keys) { char *k = NULL; if (keys & NOPH_GameCanvas_LEFT_PRESSED) k = "J"; else if (keys & NOPH_GameCanvas_RIGHT_PRESSED) k = "K"; else if (keys & NOPH_GameCanvas_UP_PRESSED) k = "+"; else if (keys & NOPH_GameCanvas_DOWN_PRESSED) k = "-"; else if (keys & NOPH_GameCanvas_FIRE_PRESSED) k = "Q"; else if (keys & NOPH_GameCanvas_GAME_A_PRESSED) k = "Button-Left"; else if (keys & NOPH_GameCanvas_GAME_B_PRESSED) k = "Button-Right"; else if (keys & NOPH_GameCanvas_GAME_C_PRESSED) k = "Button-Up"; else if (keys & NOPH_GameCanvas_GAME_D_PRESSED) k = "Button-Down"; roadmap_log (ROADMAP_DEBUG, "In roadmap_main_process_key, keys:%d, k:%s, RoadMapMainInput:0x%x\n", keys, k, RoadMapMainInput); if ((k != NULL) && (RoadMapMainInput != NULL)) { (*RoadMapMainInput) (k); } } void roadmap_main_toggle_full_screen (void) { static int RoadMapIsFullScreen = 0; if (RoadMapIsFullScreen) { } else { } } void roadmap_main_new (const char *title, int width, int height) { } void roadmap_main_set_keyboard (struct RoadMapFactoryKeyMap *bindings, RoadMapKeyInput callback) { RoadMapMainInput = callback; } RoadMapMenu roadmap_main_new_menu (void) { return NULL; } void roadmap_main_free_menu (RoadMapMenu menu) { } void roadmap_main_add_menu (RoadMapMenu menu, const char *label) { } void roadmap_main_add_menu_item (RoadMapMenu menu, const char *label, const char *tip, RoadMapCallback callback) { NOPH_CommandMgr_t cm = NOPH_CommandMgr_getInstance(); NOPH_CommandMgr_addCommand(cm, label, (void *)callback); } void roadmap_main_popup_menu (RoadMapMenu menu, int x, int y) { } void roadmap_main_add_separator (RoadMapMenu menu) { roadmap_main_add_menu_item (menu, NULL, NULL, NULL); } void roadmap_main_add_tool (const char *label, const char *icon, const char *tip, RoadMapCallback callback) { } void roadmap_main_add_tool_space (void) { } void roadmap_main_add_canvas (void) { roadmap_canvas_configure (); } void roadmap_main_add_status (void) { } void roadmap_main_show (void) { } void roadmap_main_set_input (RoadMapIO *io, RoadMapInput callback) { if (io->subsystem == ROADMAP_IO_SERIAL) { /* We currently only support GPS input */ if (!gps_mgr) gps_mgr = NOPH_GpsManager_getInstance(); RoadMapMainIo[0].io = *io; RoadMapMainIo[0].callback = callback; NOPH_GpsManager_start(gps_mgr); } #if 0 int i; int fd = io->os.serial; for (i = 0; i < ROADMAP_MAX_IO; ++i) { if (RoadMapMainIo[i].io.subsystem == ROADMAP_IO_INVALID) { RoadMapMainIo[i].io = *io; RoadMapMainIo[i].callback = callback; RoadMapMainIo[i].id = 0; break; } } #endif } void roadmap_main_remove_input (RoadMapIO *io) { if (io->subsystem == ROADMAP_IO_SERIAL) { /* We currently only support GPS input */ if (gps_mgr) NOPH_GpsManager_stop(gps_mgr); RoadMapMainIo[0].callback = NULL; RoadMapMainIo[0].io.subsystem = ROADMAP_IO_INVALID; } #if 0 int i; int fd = io->os.file; /* All the same on UNIX. */ for (i = 0; i < ROADMAP_MAX_IO; ++i) { if (RoadMapMainIo[i].io.os.file == fd) { RoadMapMainIo[i].io.os.file = -1; RoadMapMainIo[i].io.subsystem = ROADMAP_IO_INVALID; break; } } #endif } void roadmap_main_set_periodic (int interval, RoadMapCallback callback) { int index; struct roadmap_main_timer *timer = NULL; for (index = 0; index < ROADMAP_MAX_TIMER; ++index) { if (RoadMapMainPeriodicTimer[index].callback == callback) { return; } if (timer == NULL) { if (RoadMapMainPeriodicTimer[index].callback == NULL) { timer = RoadMapMainPeriodicTimer + index; } } } if (timer == NULL) { roadmap_log (ROADMAP_FATAL, "Timer table saturated"); } timer->id = 0; timer->callback = callback; } void roadmap_main_remove_periodic (RoadMapCallback callback) { int index; for (index = 0; index < ROADMAP_MAX_TIMER; ++index) { if (RoadMapMainPeriodicTimer[index].callback == callback) { RoadMapMainPeriodicTimer[index].callback = NULL; return; } } roadmap_log (ROADMAP_ERROR, "timer 0x%08x not found", callback); } void roadmap_main_set_status (const char *text) { } void roadmap_main_flush (void) { } void roadmap_main_exit (void) { roadmap_start_exit (); } void roadmap_main_set_cursor (int cursor) {} /* Wait until some key is pressed */ static int wait_for_events(NOPH_GameCanvas_t canvas) { static int counter = 0; int out = 0; while (1) { counter++; if (command_addr) break; /* Menu command */ if (gps_mgr) { while ((RoadMapMainIo[0].io.subsystem != ROADMAP_IO_INVALID) && (NOPH_GpsManager_read(gps_mgr, 0, 0) != 0)) { /* GPS data is ready */ RoadMapInput callback = RoadMapMainIo[0].callback; if (callback) (*callback)(&RoadMapMainIo[0].io); } } if ((out = NOPH_GameCanvas_getKeyStates(canvas)) != 0) break; if ((counter % 300) == 0) { int i; for (i=0; i<ROADMAP_MAX_TIMER; i++) { if (RoadMapMainPeriodicTimer[i].callback) { (*RoadMapMainPeriodicTimer[i].callback) (); } } } NOPH_Thread_sleep( 10 ); } return out; } #define SLEEP_PERIOD 100 int main (int argc, char **argv) { int i; int should_exit = 0; NOPH_GameCanvas_t canvas; printf ("**** test: %d\n", strlen("sdfsdf")); for (i = 0; i < ROADMAP_MAX_IO; ++i) { RoadMapMainIo[i].io.os.file = -1; RoadMapMainIo[i].io.subsystem = ROADMAP_IO_INVALID; } canvas = NOPH_GameCanvas_get(); roadmap_start_subscribe (roadmap_start_event); roadmap_start (argc, argv); if (NOPH_exception) { NOPH_Throwable_printStackTrace(NOPH_exception); exit(1); } NOPH_CommandMgr_setResultMem(NOPH_CommandMgr_getInstance(), &command_addr); /* The main game loop */ while(!should_exit) { int keys; /* Wait for a keypress */ keys = wait_for_events(canvas); if (command_addr) { ((RoadMapCallback)command_addr)(); command_addr = 0; } roadmap_main_process_key (keys); } return 0; } |
Update of /cvsroot/roadmap/roadmap_editor/j2me/res In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15814/j2me/res Added Files: Tag: BR-J2ME objects objects_wide preferences schema sprites usc77001.rdm usdir.rdm Log Message: OK, who wants to run RoadMap on his J2ME phone? This is an import of the RoadMap j2ME branch. --- NEW FILE: preferences --- Style.Use Pretty Lines: yes Shapes.Declutter: 1300 Polygons.Declutter: 1300 Location.Color: red Highlight.Thickness: 4 Highlight.Duration: 10 Highlight.Background: yellow Help.Browser: \windows\iexplore Help.Arguments: %s GPS.Foreground: black GPS.Color: red GPS.Background: LightYellow Destination.Color: red Drivers.Trace: Disabled Drivers.Kismet: Disabled Drivers.Friends: Disabled Drivers.Ghost2: Disabled Drivers.Ghost1: Disabled Drivers.Port: 2007 Map.GPS map offset longitude: 0 Map.GPS map offset latitude: 0 History.Depth: 100 GPS.Timeout: 10 GPS.Baud Rate: 4800 GPS.Source: com1: Accuracy.GPS Position: 30 Accuracy.GPS Speed: 4 Voice.Selected Street: flite -t 'Selected %T' Voice.Next Intersection: flite -t 'Next intersection: %T' Voice.Current Street: Voice.Approach: flite -t 'Approaching %T' Error.Foreground: white Error.Background: red Info.Foreground: black Info.Background: yellow Selected Street.Foreground: black Selected Street.Background: yellow Selected Street.Text: %F Approach.Foreground: white Approach.Background: DarkSeaGreen4 Approach.Text: ××ª×§×¨× ×-%N, %C|××ª×§×¨× ×- %N Current Street.Foreground: white Current Street.Background: DarkSeaGreen4 Current Street.Text: %N, %C|%N Console.Foreground: black Console.Background: yellow Display.Top Right: ETA: %A|%T Display.Bottom Left: %S Display.Bottom Right: %D (%W)|%D Display.Duration: 10 Accuracy.Confidence: 250 Accuracy.Street: 35 Style.Show Objects when Dragging: yes Style.Pretty Lines when Dragging: yes Map.Refresh: normal Map.Signs: yes Accuracy.Mouse: 20 Display.Rotate: yes General.Default Zoom: 20 Map.Cache: 8 General.Icons: yes General.Toolbar: no Geometry.Main: 800x600 General.Keyboard: no General.Unit: metric --- NEW FILE: usdir.rdm --- (This appears to be a binary file; contents omitted.) --- NEW FILE: objects --- N Compass E Compass E Compass_fixed P 20 20 S orientation_mode B -20 -16 20 16 A toggleorientation N zoom1_button I rm_zoom1 P -26 -135 O 160 A zoom1 B -4 -4 28 28 S zoom_reset N zoomin_button I rm_zoomin P -26 -100 O 160 A zoomin B -4 -4 28 28 N zoomout_button I rm_zoomout P -26 -65 O 160 A zoomout B -4 -4 28 28 N gps_button I rm_gps P -26 -30 O 160 A gps B -4 -4 28 28 S GPS_focus N quit_button I rm_quit P -20 1 A quit B -4 -4 20 20 N full_screen I rm_full P -20 25 A full B -4 -4 20 20 N view_button I rm_3d I rm_2d P 1 -30 O 160 A toggleview toggleskin B -4 -4 28 28 S view_mode N gps_reception E Reception_na E Reception_none E Reception_poor E Reception_good P 19 60 S GPS_reception R N menu_button I rm_menu P 1 100 O 160 A quickmenu B -4 -4 28 28 N new_roads I rm_new_roads X I rm_new_roads A togglenewroads S new_roads P -60 -30 O 200 B -4 -4 28 28 R --- NEW FILE: usc77001.rdm --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sprites --- # Syntax of the sprite description: # S <name>: start a sprite. # F <color> <thickness>: start a new color plane. # L <x>,<y> ...: defines a line. # P <x>,<y> ...: defines a (filled) polygon. # C <x>,<y> <radius>: defines a circle. # D <x>,<y> <radius>: defines a disk (i.e. a filled circle). # the coordinates x and y are relative to the sprite's hot point. # S GPS F #ffffff 2 L 0,-7 7,8 0,4 -7,8 0,-7 F #0000ff 1 P 0,-6 6,7 0,3 -6,7 L 9,7 0,-9 -9,7 S Friend F #ffffff 2 L 0,0 7,14 0,8 -7,14 F #006400 2 L 0,1 6,13 0,10 -6,13 0,1 S Position F #ffffff 3 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 F #000000 1 L 0,-10 0,-20 L 0,10 0,20 L 10,0 20,0 L -10,0 -20,0 C 0,0 15 S Direction F #ff0000 1 P -5,-20 0,-35 5,-20 F #000000 1 L -5,-20 0,-35 5,-20 -5,-20 S Destination F #ff0000 1 D 0,0 5 F #000000 1 C 0,0 5 S Waypoint F #00ff00 1 D 0,0 5 F #000000 1 C 0,0 5 S Selection F #0000ff 1 D 0,0 5 F #000000 1 C 0,0 5 S Highlight F #adff2f 1 D 0,0 5 F #000000 1 C 0,0 5 S Compass F #ffffff 1 D 0,0 13 F #000000 1 C 0,0 13 F #ff0000 1 P -4,0 0,-13 4,0 F #000000 1 L -4,0 0,-13 4,0 L -4,0 0,13 4,0 L -17,0 -7,0 L 7,0 17,0 L 0,-13 0,-17 L 0,13 0,17 S Compass_fixed F #ff0000 1 P -9,13 0,8 9,13 0,-13 F #000000 2 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S Compass_north F #ffffff 1 P -16,16 16,16 16,-16 -16,-16 F #000000 2 L -16,16 16,16 16,-16 -16,-16 -16,16 F #ff0000 1 P -9,13 0,8 9,13 0,-13 F #000000 1 L 0,8 9,13 0,-13 L 0,8 -9,13 0,-13 S Download F #ffffff 1 D 0,0 8 F #ff0000 3 C 0,0 8 P -7,-6 -15,4 1,4 P 7,6 15,-4 -1,-4 S Kismet F #ff0000 1 D 0,0 10 # GPS Indication symbols: S Reception_na F #ffffff 1 D 0,0 15 F #000000 1 C 0,0 15 F #ffffff 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F #000000 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 F #8b0000 2 L -9,-9 9,9 L 9,-9 -9,9 S reception_none F #ffffff 1 D 0,0 15 F #000000 1 C 0,0 15 F #ff0000 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F #000000 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 S reception_poor F #ffffff 1 D 0,0 15 F #000000 1 C 0,0 15 F #adff2f 1 P -10,-5 -3,-12 0,-5 -2,-3 P 5,0 12,3 5,10 2,3 P 5,-10 10,-5 0,5 -5,0 F #000000 1 L -10,-5 -3,-12 0,-5 -2,-3 -10,-5 L 5,0 12,3 5,10 2,3 5,0 L 5,-10 10,-5 0,5 -5,0 5,-10 L -7,1 -6,3 -3,6 -1,7 L -10,1 -9,3 -3,9 -1,10 L -13,1 -12,3 -3,12 -1,13 S reception_good F #00ff00 1 D 0,0 15 F #000000 1 C 0,0 15 F #ffffff 1 P 10,-5 3,-12 0,-5 2,-3 P -5,0 -12,3 -5,10 -2,3 P -5,-10 -10,-5 0,5 5,0 F #000000 1 L 10,-5 3,-12 0,-5 2,-3 10,-5 L -5,0 -12,3 -5,10 -2,3 -5,0 L -5,-10 -10,-5 0,5 5,0 -5,-10 L 7,1 6,3 3,6 1,7 L 10,1 9,3 3,9 1,10 L 13,1 12,3 3,12 1,13 S Marker F #0000ff 1 D 0,0 5 F #000000 1 C 0,0 6 F #adff2f 1 P -3,1 0,-6 3,1 S X F #8b0000 4 L 4,4 20,20 L 20,4 4,20 --- NEW FILE: objects_wide --- N Compass E Compass E Compass_fixed P 20 20 S orientation_mode B -20 -16 20 16 A toggleorientation N zoom1_button I rm_zoom1 P -26 -135 O 160 A zoom1 B -4 -4 28 28 S zoom_reset N zoomin_button I rm_zoomin P -26 -100 O 160 A zoomin B -4 -4 28 28 N zoomout_button I rm_zoomout P -26 -65 O 160 A zoomout B -4 -4 28 28 N gps_button I rm_gps P -26 -30 O 160 A gps B -4 -4 28 28 S GPS_focus N quit_button I rm_quit P -20 1 A quit B -4 -4 20 20 N full_screen I rm_full P -20 25 A full B -4 -4 20 20 N view_button I rm_3d I rm_2d P 1 -30 O 160 A toggleview toggleskin B -4 -4 28 28 S view_mode N gps_reception E Reception_na E Reception_none E Reception_poor E Reception_good P 19 60 S GPS_reception R N menu_button I rm_menu P 1 100 O 160 A quickmenu B -4 -4 28 28 N new_roads I rm_new_roads X I rm_new_roads A togglenewroads S new_roads P -60 -30 O 200 B -4 -4 28 28 R --- NEW FILE: schema --- Map.Background: #ffffcc Labels.Color: black Console.Foreground: black Freeways.Class: Road Freeways.Color: #000000 Freeways.Color1: #414182 Freeways.Declutter: 2147483647 Freeways.Delta1: -2 Freeways.Thickness: 6 Primary.Class: Road Primary.Color: #000000 Primary.Color1: #ae0a34 Primary.Declutter: 2147483647 Primary.Delta1: -2 Primary.Thickness: 6 Secondary.Class: Road Secondary.Color: #000000 Secondary.Color1: #22632b Secondary.Declutter: 1500 Secondary.Delta1: -2 Secondary.Thickness: 5 Ramps.Class: Road Ramps.Color: #000000 Ramps.Color1: #1e7546 Ramps.Declutter: 160 Ramps.Delta1: -2 Ramps.Thickness: 3 Highways.Class: Road Highways.Color: #000000 Highways.Color1: #FDBF6F Highways.Declutter: 350 Highways.Delta1: -2 Highways.Thickness: 3 Exit.Class: Road Exit.Color: #000000 Exit.Color1: #FDBF6F Exit.Declutter: 350 Exit.Delta1: -2 Exit.Thickness: 3 Streets.Class: Road Streets.Color: #000000 Streets.Color1: white Streets.Declutter: 100 Streets.Delta1: -2 Streets.Thickness: 2 Pedestrian.Class: Road Pedestrian.Color: DarkGrey Pedestrian.Declutter: 160 Pedestrian.Delta1: 0 Pedestrian.Thickness: 1 4X4 Trails.Class: Road 4X4 Trails.Color: DarkGrey 4X4 Trails.Declutter: 160 4X4 Trails.Delta1: 0 4X4 Trails.Thickness: 1 Trails.Class: Road Trails.Color: DarkGrey Trails.Declutter: 160 Trails.Delta1: 0 Trails.Thickness: 1 Walkway.Class: Road Walkway.Color: DarkGrey Walkway.Declutter: 160 Walkway.Delta1: 0 Walkway.Thickness: 1 Airports.Class: Area Airports.Color: grey Airports.Declutter: 4096 Airports.Delta1: 0 Airports.Thickness: 1 Hospitals.Class: Area Hospitals.Color: red Hospitals.Declutter: 4096 Hospitals.Delta1: 0 Hospitals.Thickness: 1 Lakes.Class: Area Lakes.Color: LightBlue Lakes.Declutter: 1300 Lakes.Delta1: 0 Lakes.Thickness: 1 Malls.Class: Area Malls.Color: yellow Malls.Declutter: 4096 Malls.Delta1: 0 Malls.Thickness: 1 Parks.Class: Area Parks.Color: green Parks.Declutter: 4096 Parks.Delta1: 0 Parks.Thickness: 1 Rivers.Class: Feature Rivers.Color: LightBlue Rivers.Declutter: 300 Rivers.Delta1: 0 Rivers.Thickness: 3 Sea.Class: Area Sea.Color: SlateBlue Sea.Declutter: 2147483647 Sea.Delta1: 0 Sea.Thickness: 1 Shore.Class: Feature Shore.Color: LightSlateBlue Shore.Declutter: 2147483647 Shore.Delta1: 0 Shore.Thickness: 2 Stations.Class: Area Stations.Color: grey Stations.Declutter: 4096 Stations.Delta1: 0 Stations.Thickness: 1 |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:56
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/tmpclasses In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/tmpclasses Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/tmpclasses added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:51
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/c In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/c Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/c added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:49
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/src Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/src added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:47
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/classes In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/classes Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/classes added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:47
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/res In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/res Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/res added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:21:47
|
Update of /cvsroot/roadmap/roadmap_editor/j2me/resources In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13442/resources Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me/resources added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-02-09 17:20:23
|
Update of /cvsroot/roadmap/roadmap_editor/j2me In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12783/j2me Log Message: Directory /cvsroot/roadmap/roadmap_editor/j2me added to the repository --> Using per-directory sticky tag `BR-J2ME' |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:49
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/setupdll Modified Files: setupdll.vcp Log Message: Update EVC environment. Index: setupdll.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll/setupdll.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setupdll.vcp 3 Sep 2006 18:20:35 -0000 1.2 --- setupdll.vcp 28 Jan 2007 23:28:12 -0000 1.3 *************** *** 46,49 **** --- 46,50 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r *************** *** 105,112 **** DEP_CPP_SETUP=\ ".\setupdll.h"\ ! ! NODEP_CPP_SETUP=\ ! ".\e_setup.h"\ ! ".\otify.h"\ # End Source File --- 106,111 ---- DEP_CPP_SETUP=\ ".\setupdll.h"\ ! {$(INCLUDE)}"ce_setup.h"\ ! {$(INCLUDE)}"notify.h"\ # End Source File |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:46
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/rdmghost Modified Files: rdmghost.vcp Log Message: Update EVC environment. Index: rdmghost.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost/rdmghost.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rdmghost.vcp 3 Sep 2006 18:20:35 -0000 1.3 --- rdmghost.vcp 28 Jan 2007 23:28:12 -0000 1.4 *************** *** 46,49 **** --- 46,50 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:17
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/zlib Modified Files: zlibce.vcp Log Message: Update EVC environment. Index: zlibce.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib/zlibce.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zlibce.vcp 17 Nov 2006 16:48:56 -0000 1.1 --- zlibce.vcp 28 Jan 2007 23:28:12 -0000 1.2 *************** *** 589,592 **** --- 589,593 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" RSC=rc.exe *************** *** 595,599 **** 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" /D "ZLIBCE_EXPORTS" /YX /O2 /M$(CECrtMT) /c ! # ADD 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" /D "ZLIBCE_EXPORTS" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 596,600 ---- 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" /D "ZLIBCE_EXPORTS" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "ZLIBCE_EXPORTS" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 604,608 **** LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "zlibce - Win32 (WCE ARMV4) Debug" --- 605,609 ---- LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "zlibce - Win32 (WCE ARMV4) Debug" |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:17
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libpng In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/libpng Modified Files: lpngce.vcp Log Message: Update EVC environment. Index: lpngce.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libpng/lpngce.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lpngce.vcp 21 Nov 2006 09:36:29 -0000 1.1 --- lpngce.vcp 28 Jan 2007 23:28:12 -0000 1.2 *************** *** 65,68 **** --- 65,81 ---- # PROP Intermediate_Dir "WMIPSRel" # PROP Target_Dir "" + CPP=clmips.exe + # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /QMRWCE /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + 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 /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 70,86 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - CPP=clmips.exe - # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /QMRWCE /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug" --- 83,86 ---- *************** *** 96,99 **** --- 96,112 ---- # PROP Intermediate_Dir "WMIPSDbg" # PROP Target_Dir "" + CPP=clmips.exe + # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /QMRWCE /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + 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 /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 101,117 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - CPP=clmips.exe - # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /QMRWCE /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE SH4) Release" --- 114,117 ---- *************** *** 251,254 **** --- 251,267 ---- # PROP Intermediate_Dir "WCEARMRel" # PROP Target_Dir "" + CPP=clarm.exe + # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + # ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + 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 coredll.lib commctrl.lib /nologo /dll /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 256,272 **** # ADD LINK32 coredll.lib commctrl.lib /nologo /dll /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - # ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - CPP=clarm.exe - # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug" --- 269,272 ---- *************** *** 282,285 **** --- 282,298 ---- # PROP Intermediate_Dir "WCEARMDbg" # PROP Target_Dir "" + CPP=clarm.exe + # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + # ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + 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 coredll.lib commctrl.lib /nologo /dll /debug /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 287,303 **** # ADD LINK32 coredll.lib commctrl.lib /nologo /dll /debug /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - # ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - CPP=clarm.exe - # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release" --- 300,303 ---- *************** *** 313,316 **** --- 313,329 ---- # PROP Intermediate_Dir "WMIPSFPRel" # PROP Target_Dir "" + CPP=clmips.exe + # ADD BASE CPP /nologo /QMFWCE /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /QMFWCE /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + 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 /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 318,334 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - CPP=clmips.exe - # ADD BASE CPP /nologo /QMFWCE /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /QMFWCE /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug" --- 331,334 ---- *************** *** 344,347 **** --- 344,360 ---- # PROP Intermediate_Dir "WMIPSFPDbg" # PROP Target_Dir "" + CPP=clmips.exe + # ADD BASE CPP /nologo /QMFWCE /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /QMFWCE /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" + 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 /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 349,365 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - # ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "DEBUG" - CPP=clmips.exe - # ADD BASE CPP /nologo /QMFWCE /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /QMFWCE /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE x86) Release" --- 362,365 ---- *************** *** 435,454 **** # PROP Intermediate_Dir "x86emRel" # PROP Target_Dir "" - LINK32=link.exe - # ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation - # ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" - # ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" CPP=cl.exe # ADD BASE CPP /nologo /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_X86_" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE /Gz # ADD CPP /nologo /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_X86_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE /Gz # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug" --- 435,454 ---- # PROP Intermediate_Dir "x86emRel" # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_X86_" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE /Gz # ADD CPP /nologo /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_X86_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE /Gz # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" + # ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" + 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 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation + # ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug" *************** *** 464,483 **** # PROP Intermediate_Dir "x86emDbg" # PROP Target_Dir "" - LINK32=link.exe - # ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation - # ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_X86_" - # ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_X86_" CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_X86_" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE /Gz # ADD CPP /nologo /W3 /Gm /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_X86_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE /Gz # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE PPC) Release" --- 464,483 ---- # PROP Intermediate_Dir "x86emDbg" # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_X86_" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE /Gz # ADD CPP /nologo /W3 /Gm /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_X86_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE /Gz # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_X86_" + # ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_X86_" + 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 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation + # ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /dll /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE PPC) Release" *************** *** 493,496 **** --- 493,509 ---- # PROP Intermediate_Dir "WCEPPCRel" # PROP Target_Dir "" + CPP=clppc.exe + # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + # ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG" + 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 /nologo /dll /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 498,514 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - # ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG" - CPP=clppc.exe - # ADD BASE CPP /nologo /M$(CECrtMT) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "NDEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug" --- 511,514 ---- *************** *** 524,527 **** --- 524,540 ---- # PROP Intermediate_Dir "WCEPPCDbg" # PROP Target_Dir "" + CPP=clppc.exe + # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE + # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE + # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE + RSC=rc.exe + # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG" + # ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG" + 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 /nologo /dll /debug /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 *************** *** 529,545 **** # ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096 # SUBTRACT LINK32 /pdb:none /nodefaultlib - 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 - RSC=rc.exe - # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG" - # ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG" - CPP=clppc.exe - # ADD BASE CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "DEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c /D $(CePlatform) /D _UNICODE - # ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\.." /I "..\..\..\zlib" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "PNG_BUILD_DLL" /c /D $(CePlatform) /D _UNICODE - # SUBTRACT CPP /YX /D $(CePlatform) /D UNICODE /D _UNICODE !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE ARMV4) Release" --- 542,545 ---- *************** *** 558,561 **** --- 558,562 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" RSC=rc.exe *************** *** 564,568 **** 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 /I "..\..\..\zlib" /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 MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 565,569 ---- 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 /Zd /I "..\..\..\zlib" /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 MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 573,577 **** LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE ARMV4) Debug" --- 574,578 ---- LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "lpngce - Win32 (WCE ARMV4) Debug" |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:16
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/libguiroadgps Modified Files: libguiroadgps.vcp Log Message: Update EVC environment. Index: libguiroadgps.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps/libguiroadgps.vcp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** libguiroadgps.vcp 17 Nov 2006 16:48:55 -0000 1.5 --- libguiroadgps.vcp 28 Jan 2007 23:28:12 -0000 1.6 *************** *** 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 "../../" /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)" == "libguiroadgps - 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 "../../" /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)" == "libguiroadgps - 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 "../../" /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)" == "libguiroadgps - 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 "../../" /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)" == "libguiroadgps - Win32 (WCE x86) Release" *************** *** 635,643 **** --- 635,647 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ *************** *** 659,667 **** --- 663,675 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ *************** *** 962,965 **** --- 970,1241 ---- # End Source File + # Begin Source File + + SOURCE=..\..\..\roadmap_lang.c + + !IF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" + + DEP_CPP_ROADMAP=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Debug" + + DEP_CPP_ROADMAP=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Debug" + + DEP_CPP_ROADMAP=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Release" + + DEP_CPP_ROADMAP=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_ROADMAP=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\..\roadmap_pointer.c + + !IF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" + + DEP_CPP_ROADMAP_=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Debug" + + DEP_CPP_ROADMAP_=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Debug" + + DEP_CPP_ROADMAP_=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Release" + + DEP_CPP_ROADMAP_=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_ROADMAP_=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_pointer.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\..\roadmap_res.c + + !IF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" + + DEP_CPP_ROADMAP_R=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Debug" + + DEP_CPP_ROADMAP_R=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Debug" + + DEP_CPP_ROADMAP_R=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Release" + + DEP_CPP_ROADMAP_R=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_ROADMAP_R=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_hash.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + + + !ENDIF + + # End Source File # End Group # Begin Group "Header Files" |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:15
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libfribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/libfribidi Modified Files: libfribidi.vcp Log Message: Update EVC environment. Index: libfribidi.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libfribidi/libfribidi.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libfribidi.vcp 7 Jan 2007 10:27:12 -0000 1.1 --- libfribidi.vcp 28 Jan 2007 23:28:12 -0000 1.2 *************** *** 46,54 **** # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # 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" /D "_USRDLL" /D "LIBFRIBIDI_EXPORTS" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_9_I" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_2_I" /D "MEM_OPTIMIZED" /D "FRIBIDI_NO_CHARSETS" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 46,55 ---- # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # 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" /D "_USRDLL" /D "LIBFRIBIDI_EXPORTS" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_9_I" /D "HAS_FRIBIDI_TAB_CHAR_TYPE_2_I" /D "MEM_OPTIMIZED" /D "FRIBIDI_NO_CHARSETS" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 58,62 **** LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "libfribidi - Win32 (WCE ARMV4) Debug" --- 59,63 ---- LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "libfribidi - Win32 (WCE ARMV4) Debug" |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:15
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/agg Modified Files: agg.vcp Log Message: Update EVC environment. Index: agg.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg/agg.vcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** agg.vcp 17 Nov 2006 16:48:55 -0000 1.4 --- agg.vcp 28 Jan 2007 23:28:11 -0000 1.5 *************** *** 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 "../../../agg/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" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 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 "../../../agg/include" /I "../../../freetype/include" /I "../../../libfribidi" /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" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:15
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/RoadGPS Modified Files: RoadGPS.vcp Log Message: Update EVC environment. Index: RoadGPS.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS/RoadGPS.vcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RoadGPS.vcp 3 Sep 2006 18:20:34 -0000 1.4 --- RoadGPS.vcp 28 Jan 2007 23:28:11 -0000 1.5 *************** *** 51,69 **** # 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 "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /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)" == "RoadGPS - Win32 (WCE ARM) Debug" --- 51,69 ---- # 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 "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /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)" == "RoadGPS - Win32 (WCE ARM) Debug" *************** *** 84,102 **** # 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" /D "_ROADGPS" /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)" == "RoadGPS - Win32 (WCE x86) Release" --- 84,102 ---- # 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" /D "_ROADGPS" /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)" == "RoadGPS - Win32 (WCE x86) Release" *************** *** 230,234 **** LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.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 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF --- 230,234 ---- LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.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 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF *************** *** 427,433 **** --- 427,435 ---- "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_download.h"\ "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gps.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ *************** *** 439,442 **** --- 441,445 ---- "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ *************** *** 468,474 **** --- 471,479 ---- "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_download.h"\ "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_gps.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ *************** *** 480,483 **** --- 485,489 ---- "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:15
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659/FreeMap Modified Files: FreeMap.vcp Log Message: Update EVC environment. Index: FreeMap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap/FreeMap.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FreeMap.vcp 17 Nov 2006 16:48:55 -0000 1.3 --- FreeMap.vcp 28 Jan 2007 23:28:11 -0000 1.4 *************** *** 52,56 **** # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # 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 /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 52,56 ---- # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # 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 /Zd /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "FREEMAP_IL" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 60,64 **** 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 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Debug" --- 60,65 ---- 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 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM /MAPINFO:LINES /MAPINFO:EXPORTS ! # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Debug" *************** *** 170,173 **** --- 171,175 ---- "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_res.h"\ "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ |
From: Ehud S. <esh...@us...> - 2007-01-28 23:28:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6659 Modified Files: Roadmap.vcw Log Message: Update EVC environment. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Roadmap.vcw 7 Jan 2007 10:28:40 -0000 1.14 --- Roadmap.vcw 28 Jan 2007 23:28:11 -0000 1.15 *************** *** 88,94 **** End Project Dependency Begin Project Dependency - Project_Dep_Name fribidi - End Project Dependency - Begin Project Dependency Project_Dep_Name libft End Project Dependency --- 88,91 ---- *************** *** 105,108 **** --- 102,108 ---- Project_Dep_Name zlibce End Project Dependency + Begin Project Dependency + Project_Dep_Name libfribidi + End Project Dependency }}} |
From: Ehud S. <esh...@us...> - 2007-01-28 23:27:33
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6308 Modified Files: roadmap_download.c Log Message: Change map directory. Index: roadmap_download.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roadmap_download.c 22 Jan 2007 16:56:55 -0000 1.15 --- roadmap_download.c 28 Jan 2007 23:27:29 -0000 1.16 *************** *** 1021,1025 **** ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/dev3/" ROADMAP_FILE_NAME_FORMAT, NULL); --- 1021,1025 ---- ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/v2/" ROADMAP_FILE_NAME_FORMAT, NULL); |
From: Ehud S. <esh...@us...> - 2007-01-28 23:27:07
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5905 Modified Files: roadmap_start.c Log Message: Change initialization order so the markers do not appear on top of the navigation bar. Index: roadmap_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_start.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** roadmap_start.c 22 Jan 2007 16:56:55 -0000 1.35 --- roadmap_start.c 28 Jan 2007 23:27:00 -0000 1.36 *************** *** 1252,1257 **** if (RoadMapStartSubscribers) RoadMapStartSubscribers (ROADMAP_START_INIT); - editor_main_initialize (); navigate_main_initialize (); roadmap_screen_obj_initialize (); --- 1252,1257 ---- if (RoadMapStartSubscribers) RoadMapStartSubscribers (ROADMAP_START_INIT); navigate_main_initialize (); + editor_main_initialize (); roadmap_screen_obj_initialize (); |
From: Ehud S. <esh...@us...> - 2007-01-28 21:54:13
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv449 Modified Files: editor_main.c Log Message: Bump version. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** editor_main.c 22 Jan 2007 17:00:35 -0000 1.23 --- editor_main.c 28 Jan 2007 21:54:08 -0000 1.24 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0 rc4"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.9.0"; void editor_main_check_map (void) { |
From: Ehud S. <esh...@us...> - 2007-01-28 21:49:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31049 Modified Files: editor_export.c Log Message: Sync database after export. Index: editor_export.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** editor_export.c 8 Oct 2006 20:02:13 -0000 1.17 --- editor_export.c 28 Jan 2007 21:49:34 -0000 1.18 *************** *** 666,669 **** --- 666,671 ---- } + editor_db_sync (fips); + if (callbacks) (*callbacks->progress) (100); close_export_stream (&stream); *************** *** 789,792 **** --- 791,796 ---- editor_trkseg_reset_next_export (); + editor_db_sync (fips); + if (!callbacks) { editor_export_upload (name); |
From: Ehud S. <esh...@us...> - 2007-01-28 21:47:28
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/db In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30286 Modified Files: editor_db.h Log Message: Export editor_db_sync. Index: editor_db.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_db.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editor_db.h 31 Dec 2005 09:58:24 -0000 1.3 --- editor_db.h 28 Jan 2007 21:47:21 -0000 1.4 *************** *** 64,67 **** --- 64,68 ---- int editor_db_activate (int fips); int editor_db_locator(const RoadMapPosition *position); + void editor_db_sync (int fips); void editor_db_close (int fips); void editor_db_delete (int fips); |
From: Ehud S. <esh...@us...> - 2007-01-22 17:03:41
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11566 Modified Files: roadmap_net.c roadmap_sound.c Log Message: Various fixes for RC4. Index: roadmap_sound.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_sound.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_sound.c 7 Jan 2007 10:20:01 -0000 1.3 --- roadmap_sound.c 22 Jan 2007 17:03:33 -0000 1.4 *************** *** 99,102 **** --- 99,105 ---- int roadmap_sound_play_list (const RoadMapSoundList list) { + if (!(list->flags & SOUND_LIST_NO_FREE)) { + roadmap_sound_list_free (list); + } return 0; } Index: roadmap_net.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_net.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_net.c 14 Oct 2006 09:16:27 -0000 1.3 --- roadmap_net.c 22 Jan 2007 17:03:33 -0000 1.4 *************** *** 144,147 **** --- 144,148 ---- } + free(hostname); return (RoadMapSocket)s; |