Menu
▾
▴
navit-cvs-commit — CVS commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
(59) |
Sep
(43) |
Oct
(95) |
Nov
(135) |
Dec
(108) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(229) |
Feb
(141) |
Mar
(59) |
Apr
(70) |
May
(64) |
Jun
(87) |
Jul
(57) |
Aug
(108) |
Sep
(74) |
Oct
(203) |
Nov
(141) |
Dec
(108) |
| 2009 |
Jan
(114) |
Feb
(91) |
Mar
(101) |
Apr
(69) |
May
(54) |
Jun
(82) |
Jul
(49) |
Aug
(109) |
Sep
(81) |
Oct
(93) |
Nov
(100) |
Dec
(79) |
| 2010 |
Jan
(46) |
Feb
(36) |
Mar
(135) |
Apr
(103) |
May
(116) |
Jun
(130) |
Jul
(52) |
Aug
(31) |
Sep
(46) |
Oct
(48) |
Nov
(98) |
Dec
(110) |
| 2011 |
Jan
(234) |
Feb
(184) |
Mar
(150) |
Apr
(43) |
May
(53) |
Jun
(52) |
Jul
(112) |
Aug
(72) |
Sep
(79) |
Oct
(23) |
Nov
(6) |
Dec
(30) |
| 2012 |
Jan
(39) |
Feb
(37) |
Mar
(49) |
Apr
(60) |
May
(63) |
Jun
(38) |
Jul
(33) |
Aug
(24) |
Sep
(20) |
Oct
(14) |
Nov
(23) |
Dec
(50) |
| 2013 |
Jan
(30) |
Feb
(32) |
Mar
(27) |
Apr
(41) |
May
(59) |
Jun
(21) |
Jul
(10) |
Aug
(73) |
Sep
(23) |
Oct
(60) |
Nov
(14) |
Dec
(15) |
| 2014 |
Jan
(4) |
Feb
(8) |
Mar
(11) |
Apr
(6) |
May
(27) |
Jun
(4) |
Jul
(29) |
Aug
(62) |
Sep
(11) |
Oct
(17) |
Nov
(58) |
Dec
(9) |
| 2015 |
Jan
(23) |
Feb
(3) |
Mar
(26) |
Apr
(47) |
May
(8) |
Jun
(28) |
Jul
(10) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Alexander A. <za...@us...> - 2008-01-08 17:53:33
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7629 Modified Files: navit.c Log Message: Fix the fix Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** navit.c 8 Jan 2008 11:44:43 -0000 1.74 --- navit.c 8 Jan 2008 17:53:37 -0000 1.75 *************** *** 1176,1181 **** { struct coord c; transform_reverse(this_->trans, p, &c); ! navit_set_center(this_, &c); } --- 1176,1185 ---- { struct coord c; + struct pcoord pc; transform_reverse(this_->trans, p, &c); ! pc.x = c.x; ! pc.y = c.y; ! pc.pro = transform_get_projection(this_->trans); ! navit_set_center(this_, &pc); } |
|
From: Alexander A. <za...@us...> - 2008-01-08 17:12:58
|
Update of /cvsroot/navit/navit/src/data/garmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22023 Modified Files: garmin.c Log Message: Add:Basic search for roads Index: garmin.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** garmin.c 8 Jan 2008 11:01:36 -0000 1.14 --- garmin.c 8 Jan 2008 17:12:56 -0000 1.15 *************** *** 466,469 **** --- 466,471 ---- case GO_POLYGON: return garmin_pg2item(mr, o, otype); + case GO_ROAD: + return garmin_pl2item(mr, o, otype); default: dlog(1, "Unknown garmin object type:%d\n", |
|
From: Alexander A. <za...@us...> - 2008-01-08 11:44:47
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3317 Modified Files: navit.c navit.h Log Message: Fix: use projection when centering map Index: navit.h =================================================================== RCS file: /cvsroot/navit/navit/src/navit.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** navit.h 3 Jan 2008 22:45:25 -0000 1.27 --- navit.h 8 Jan 2008 11:44:43 -0000 1.28 *************** *** 60,64 **** void navit_add_menu_windows_items(struct navit *this_, struct menu *men); void navit_init(struct navit *this_); ! void navit_set_center(struct navit *this_, struct coord *center); void navit_set_center_screen(struct navit *this_, struct point *p); int navit_set_attr(struct navit *this_, struct attr *attr); --- 60,64 ---- void navit_add_menu_windows_items(struct navit *this_, struct menu *men); void navit_init(struct navit *this_); ! void navit_set_center(struct navit *this_, struct pcoord *center); void navit_set_center_screen(struct navit *this_, struct point *p); int navit_set_attr(struct navit *this_, struct attr *attr); Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** navit.c 7 Jan 2008 21:28:57 -0000 1.73 --- navit.c 8 Jan 2008 11:44:43 -0000 1.74 *************** *** 1134,1141 **** void ! navit_set_center(struct navit *this_, struct coord *center) { struct coord *c=transform_center(this_->trans); ! *c=*center; if (this_->ready) navit_draw(this_); --- 1134,1151 ---- void ! navit_set_center(struct navit *this_, struct pcoord *center) { struct coord *c=transform_center(this_->trans); ! struct coord c1,c2; ! enum projection pro = transform_get_projection(this_->trans); ! if (pro != center->pro) { ! c1.x = center->x; ! c1.y = center->y; ! transform_from_to(&c1, center->pro, &c2, pro); ! } else { ! c2.x = center->x; ! c2.y = center->y; ! } ! *c=c2; if (this_->ready) navit_draw(this_); |
|
From: Alexander A. <za...@us...> - 2008-01-08 11:44:47
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3317/gui/gtk Modified Files: destination.c Log Message: Fix: use projection when centering map Index: destination.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** destination.c 7 Jan 2008 23:15:41 -0000 1.12 --- destination.c 8 Jan 2008 11:44:44 -0000 1.13 *************** *** 37,41 **** { struct pcoord *c=NULL; - struct coord co; GtkTreeIter iter; if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (search->liststore2), &iter)) --- 37,40 ---- *************** *** 43,49 **** gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1); if (c) { ! co.x = c->x; ! co.y = c->y; ! navit_set_center(search->nav, &co); } } --- 42,46 ---- gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), &iter, COL_COUNT, &c, -1); if (c) { ! navit_set_center(search->nav, c); } } |
|
From: Alexander A. <za...@us...> - 2008-01-08 11:01:34
|
Update of /cvsroot/navit/navit/src/data/garmin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16848 Modified Files: garmin.c Log Message: Add:Initial search for cities in garmin maps Index: garmin.c =================================================================== RCS file: /cvsroot/navit/navit/src/data/garmin/garmin.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** garmin.c 3 Jan 2008 11:13:34 -0000 1.13 --- garmin.c 8 Jan 2008 11:01:36 -0000 1.14 *************** *** 71,74 **** --- 71,75 ---- void *last_oattr; unsigned int last_attr; + struct gar_search *search; }; *************** *** 178,196 **** gmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial) { ! return NULL; ! } ! static void ! gmap_search_destroy(struct map_search_priv *ms) ! { ! } ! static struct item * ! gmap_search_get_item(struct map_search_priv *ms) ! { return NULL; } - /* Assumes that only one item will be itterated at time! */ static void --- 179,241 ---- gmap_search_new(struct map_priv *map, struct item *item, struct attr *search, int partial) { ! struct map_rect_priv *mr=g_new0(struct map_rect_priv, 1); ! struct gar_search *gs; ! int rc; ! dlog(1, "Called!\n"); ! mr->mpriv=map; ! gs = g_new0(struct gar_search,1); ! if (!gs) { ! dlog(1, "Can not init search \n"); ! free(mr); ! return NULL; ! } ! mr->search = gs; ! switch (search->type) { ! case attr_country_name: ! gs->type = GS_COUNTRY; ! break; ! case attr_town_name: ! gs->type = GS_CITY; ! break; ! case attr_town_postal: ! gs->type = GS_ZIP; ! break; ! case attr_street_name: ! gs->type = GS_ROAD; ! break; ! #if someday ! case attr_region_name: ! case attr_intersection: ! case attr_housenumber: ! #endif ! default: ! dlog(1, "Don't know how to search for %d\n", search->type); ! goto out_err; ! } ! gs->match = partial ? GM_START : GM_EXACT; ! gs->needle = strdup(search->u.str); ! dlog(5, "Needle: %s\n", gs->needle); ! mr->gmap = gar_find_subfiles(mr->mpriv->g, gs, GO_GET_SEARCH); ! if (!mr->gmap) { ! dlog(1, "Can not init search \n"); ! goto out_err; ! } ! rc = gar_get_objects(mr->gmap, 0, gs, &mr->objs, GO_GET_SEARCH); ! if (rc < 0) { ! dlog(1, "Error loading objects\n"); ! goto out_err; ! } ! mr->cobj = mr->objs; ! dlog(4, "Loaded %d objects\n", rc); ! return (struct map_search_priv *)mr; ! ! out_err: ! free(gs); ! free(mr); return NULL; } /* Assumes that only one item will be itterated at time! */ static void *************** *** 339,342 **** --- 384,390 ---- attr->type = attr_label; return garmin_object_label(g, attr); + case attr_town_name: + attr->type = attr_town_name; + return garmin_object_label(g, attr); case attr_street_name: attr->type = attr_street_name; *************** *** 651,654 **** --- 699,708 ---- } + static void + gmap_search_destroy(struct map_search_priv *ms) + { + gmap_rect_destroy((struct map_rect_priv *)ms); + } + static void gmap_destroy(struct map_priv *m) *************** *** 664,669 **** static struct map_methods map_methods = { projection_garmin, ! NULL, ! // "iso8859-1", // update from the map gmap_destroy, // gmap_rect_new, --- 718,723 ---- static struct map_methods map_methods = { projection_garmin, ! // NULL, FIXME navit no longer displays labels without charset! ! "iso8859-1", // update from the map gmap_destroy, // gmap_rect_new, *************** *** 673,677 **** gmap_search_new, gmap_search_destroy, ! gmap_search_get_item, }; --- 727,731 ---- gmap_search_new, gmap_search_destroy, ! gmap_rect_get_item, }; |
|
From: KaZeR <ka...@us...> - 2008-01-08 10:46:20
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10486/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:cegui:Fixed using navit with cegui from source dir Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** gui_sdl_window.cpp 8 Jan 2008 08:40:53 -0000 1.46 --- gui_sdl_window.cpp 8 Jan 2008 10:46:23 -0000 1.47 *************** *** 566,569 **** --- 566,578 ---- filename=g_strdup_printf("%s/share/navit/datafiles", getenv("NAVIT_PREFIX")); + + if (FILE * file = fopen(filename, "r")){ + fclose(file); + dbg(0,"Ressources can be loaded from %s\n",filename); + } else { + filename=g_strdup_printf("./gui/sdl/datafiles"); + dbg(0,"Failling back to %s",filename); + } + dbg(0,"Loading SDL datafiles from %s\n",filename); |
|
From: KaZeR <ka...@us...> - 2008-01-08 08:40:49
|
Update of /cvsroot/navit/navit/src/gui/sdl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31126/gui/sdl Modified Files: gui_sdl_window.cpp Log Message: Fix:cegui:Fixed ticket #64 (segfault when using Xerces), thanks Matt Callow Index: gui_sdl_window.cpp =================================================================== RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** gui_sdl_window.cpp 6 Jan 2008 16:02:15 -0000 1.45 --- gui_sdl_window.cpp 8 Jan 2008 08:40:53 -0000 1.46 *************** *** 548,551 **** --- 548,553 ---- try { + CEGUI::System::setDefaultXMLParserName(CEGUI::String("TinyXMLParser")); + dbg(1, "Using %s as the default CEGUI XML Parser\n", CEGUI::System::getDefaultXMLParserName().c_str()); renderer = new CEGUI::OpenGLRenderer(0,XRES,YRES); new CEGUI::System(renderer); |
|
From: Albert L F. <af...@us...> - 2008-01-08 00:04:43
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6749 Modified Files: Navit.cbp gtk_graphics.cbp Log Message: fixed project file Index: Navit.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Navit.cbp 7 Jan 2008 22:11:05 -0000 1.1 --- Navit.cbp 8 Jan 2008 00:04:47 -0000 1.2 *************** *** 8,12 **** <Build> <Target title="Debug"> ! <Option output="bin\Debug\Navi" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="1" /> --- 8,12 ---- <Build> <Target title="Debug"> ! <Option output="bin\Debug\Navit" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="1" /> Index: gtk_graphics.cbp =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/gtk_graphics.cbp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gtk_graphics.cbp 7 Jan 2008 22:11:07 -0000 1.1 --- gtk_graphics.cbp 8 Jan 2008 00:04:47 -0000 1.2 *************** *** 8,12 **** <Build> <Target title="Debug"> ! <Option output=".\bin\Debug\lib_gtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> --- 8,12 ---- <Build> <Target title="Debug"> ! <Option output=".\bin\Debug\libgtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> *************** *** 23,27 **** </Target> <Target title="Release"> ! <Option output=".\bin\Release\lib_gtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> --- 23,27 ---- </Target> <Target title="Release"> ! <Option output=".\bin\Release\libgtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> *************** *** 43,47 **** <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> ! <Add option="-DMODULE=GTKGRAPHICS" /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> --- 43,47 ---- <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> ! <Add option="-DMODULE=gtk_graphics" /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> |
|
From: Albert L F. <af...@us...> - 2008-01-07 23:36:17
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25672 Modified Files: main.c Log Message: removed double setlocale(LC_NUMERIC,"C"); Index: main.c =================================================================== RCS file: /cvsroot/navit/navit/src/main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** main.c 7 Jan 2008 23:15:41 -0000 1.26 --- main.c 7 Jan 2008 23:32:33 -0000 1.27 *************** *** 103,107 **** setlocale(LC_ALL,""); setlocale(LC_NUMERIC,"C"); - setlocale(LC_NUMERIC,"C"); if (file_exists("navit.c") || file_exists("navit.o")) { --- 103,106 ---- *************** *** 113,117 **** setenv("NAVIT_SHAREDIR", buffer, 0); setenv("NAVIT_LIBPREFIX", "*/.libs/", 0); ! s=g_strdup_printf("%s/../locale", buffer); setenv("NAVIT_LOCALEDIR", s, 0); g_free(s); --- 112,116 ---- setenv("NAVIT_SHAREDIR", buffer, 0); setenv("NAVIT_LIBPREFIX", "*/.libs/", 0); ! s=g_strdup_printf("%s/../locale", buffer); setenv("NAVIT_LOCALEDIR", s, 0); g_free(s); *************** *** 122,130 **** s=g_strdup(argv[0]); s[l-10]='\0'; ! if (strcmp(s, PREFIX)) printf(_("setting '%s' to '%s'\n"), "NAVIT_PREFIX", s); setenv("NAVIT_PREFIX", s, 0); g_free(s); ! } else setenv("NAVIT_PREFIX", PREFIX, 0); } --- 121,129 ---- s=g_strdup(argv[0]); s[l-10]='\0'; ! if (strcmp(s, PREFIX)) printf(_("setting '%s' to '%s'\n"), "NAVIT_PREFIX", s); setenv("NAVIT_PREFIX", s, 0); g_free(s); ! } else setenv("NAVIT_PREFIX", PREFIX, 0); } *************** *** 169,173 **** navigation_init(); config_file=NULL; ! if (argc > 1) config_file=argv[1]; if (! config_file) { --- 168,172 ---- navigation_init(); config_file=NULL; ! if (argc > 1) config_file=argv[1]; if (! config_file) { |
|
From: Albert L F. <af...@us...> - 2008-01-07 23:15:38
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17880 Modified Files: main.c osm2navit.c popup.c Log Message: win32 patches Index: popup.c =================================================================== RCS file: /cvsroot/navit/navit/src/popup.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** popup.c 5 Jan 2008 20:04:22 -0000 1.21 --- popup.c 7 Jan 2008 23:15:41 -0000 1.22 *************** *** 241,243 **** --- 241,249 ---- popup_printf_cb(men, menu_type_menu, callback_new_2(callback_cast(popup_set_bookmark), nav, &c), _("Add as bookmark")); popup_display(nav, popup, p); + #ifdef _WIN32 + // menu needs first to be constructed before doing the menu popup + // therefore this work around for win32 + // needs to be fixed + popup=gui_popup_new(navit_get_gui(nav)); + #endif } Index: osm2navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/osm2navit.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** osm2navit.c 4 Jan 2008 22:10:11 -0000 1.24 --- osm2navit.c 7 Jan 2008 23:15:41 -0000 1.25 *************** *** 16,19 **** --- 16,20 ---- #include "item.h" #include "zipfile.h" + #include "config.h" #if 1 *************** *** 211,215 **** --- 212,218 ---- sig_alrm(int sig) { + #ifndef _WIN32 signal(SIGALRM, sig_alrm); + #endif alarm(30); fprintf(stderr,"PROGRESS%d: Processed %d nodes (%d out) %d ways %d relations %d tiles\n", phase, processed_nodes, processed_nodes_out, processed_ways, processed_relations, processed_tiles); Index: main.c =================================================================== RCS file: /cvsroot/navit/navit/src/main.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.c 7 Jan 2008 13:24:07 -0000 1.25 --- main.c 7 Jan 2008 23:15:41 -0000 1.26 *************** *** 6,11 **** --- 6,15 ---- #include <glib.h> #include <sys/types.h> + + #ifndef _WIN32 #include <sys/wait.h> #include <signal.h> + #endif + #include <unistd.h> #include <libintl.h> *************** *** 31,36 **** --- 35,42 ---- static void sigchld(int sig) { + #ifndef _WIN32 int status; while (waitpid(-1, &status, WNOHANG) > 0); + #endif } *************** *** 89,93 **** --- 95,102 ---- int l; + + #ifndef _WIN32 signal(SIGCHLD, sigchld); + #endif setenv("LC_NUMERIC","C",1); *************** *** 120,127 **** --- 129,144 ---- setenv("NAVIT_PREFIX", PREFIX, 0); } + #ifdef _WIN32 + s=g_strdup_printf("locale"); + #else s=g_strdup_printf("%s/share/locale", getenv("NAVIT_PREFIX")); + #endif setenv("NAVIT_LOCALEDIR", s, 0); g_free(s); + #ifdef _WIN32 + s=g_strdup_printf("."); + #else s=g_strdup_printf("%s/share/navit", getenv("NAVIT_PREFIX")); + #endif setenv("NAVIT_SHAREDIR", s, 0); g_free(s); |
|
From: Albert L F. <af...@us...> - 2008-01-07 23:15:38
|
Update of /cvsroot/navit/navit/src/gui/gtk In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17880/gui/gtk Modified Files: destination.c gui_gtk_action.c Log Message: win32 patches Index: destination.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** destination.c 18 Dec 2007 12:07:38 -0000 1.11 --- destination.c 7 Jan 2008 23:15:41 -0000 1.12 *************** *** 258,261 **** --- 258,266 ---- spawn_xkbd (char *xkbd_path, char *xkbd_str) { + #ifdef _WIN32 // AF FIXME for WIN32 + #ifndef F_SETFD + #define F_SETFD 2 + #endif + #else char *xkbd_args[MAX_ARGS + 1]; int fd[2]; *************** *** 299,302 **** --- 304,308 ---- return atoi (buf); } + #endif return 0; } Index: gui_gtk_action.c =================================================================== RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** gui_gtk_action.c 2 Jan 2008 20:43:52 -0000 1.27 --- gui_gtk_action.c 7 Jan 2008 23:15:41 -0000 1.28 *************** *** 508,511 **** --- 508,516 ---- } + #ifdef _WIN32 + // AF needs to be fixed for win32, + static int showPopup = 0; + #endif + static struct menu_priv * gui_gtk_ui_new (struct gui_priv *this, struct menu_methods *meth, char *path, int popup, GtkWidget **widget_ret) *************** *** 569,574 **** --- 574,591 ---- gtk_widget_show (widget); } else { + #ifdef _WIN32 + if ( showPopup ) + { + showPopup = 0; + #endif gtk_menu_popup(GTK_MENU(widget), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ()); ret->handler_id=g_signal_connect(widget, "selection-done", G_CALLBACK(popup_deactivate), ret); + #ifdef _WIN32 + } + else + { + showPopup = 1; + } + #endif } return ret; |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:33:23
|
Update of /cvsroot/navit/navit/src/vehicle/file In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32563 Modified Files: vehicle_file.c Log Message: added serial support for win32 Index: vehicle_file.c =================================================================== RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vehicle_file.c 3 Jan 2008 11:13:38 -0000 1.3 --- vehicle_file.c 7 Jan 2008 22:33:27 -0000 1.4 *************** *** 5,9 **** --- 5,13 ---- #include <glib.h> #include <sys/stat.h> + #ifdef _WIN32 + #include <serial_io.h> + #else #include <termios.h> + #endif #include <math.h> #include "config.h" *************** *** 17,20 **** --- 21,27 ---- static void vehicle_file_disable_watch(struct vehicle_priv *priv); static void vehicle_file_enable_watch(struct vehicle_priv *priv); + static void vehicle_file_parse(struct vehicle_priv *priv, char *buffer); + static void vehicle_file_close(struct vehicle_priv *priv); + enum file_type { *************** *** 41,49 **** --- 48,119 ---- int status; int sats_used; + #ifdef _WIN32 + int no_data_count; + #endif }; + #ifdef _WIN32 + static int vehicle_win32_serial_track(struct vehicle_priv *priv) + { + + static char buffer[2048] = {0,}; + static int current_index = 0; + const int chunk_size = 1024; + + if ( priv->no_data_count > 5 ) + { + vehicle_file_close( priv ); + priv->no_data_count = 0; + } + + if ( priv->fd <= 0 ) + { + vehicle_file_open( priv ); + } + + if ( current_index >= ( sizeof( buffer ) - chunk_size ) ) + { + // discard + current_index = 0; + memset( buffer, 0 , sizeof( buffer ) ); + } + + int dwBytes = serial_io_read( priv->fd, &buffer[ current_index ], chunk_size ); + if ( dwBytes > 0 ) + { + current_index += dwBytes; + + char* return_pos = NULL; + while ( ( return_pos = strchr( buffer, '\n' ) ) != NULL ) + { + char return_buffer[1024]; + int bytes_to_copy = return_pos - buffer + 1; + memcpy( return_buffer, buffer, bytes_to_copy ); + return_buffer[ bytes_to_copy + 1 ] = '\0'; + + // printf( "received %d : '%s' bytes to copy\n", bytes_to_copy, return_buffer ); + vehicle_file_parse( priv, return_buffer ); + + current_index -= bytes_to_copy; + memmove( buffer, &buffer[ bytes_to_copy ] , sizeof( buffer ) - bytes_to_copy ); + } + + } + else + { + priv->no_data_count++; + } + return 1; + } + #endif + static int vehicle_file_open(struct vehicle_priv *priv) { + #ifdef _WIN32 + char *name; + int port = atoi( priv->source + 5 ); + priv->fd=serial_io_init( port, 115200 ); + #else char *name; struct stat st; *************** *** 76,79 **** --- 146,150 ---- } priv->iochan = g_io_channel_unix_new(priv->fd); + #endif return 1; } *************** *** 82,85 **** --- 153,159 ---- vehicle_file_close(struct vehicle_priv *priv) { + #ifdef _WIN32 + serial_io_shutdown( priv->fd ); + #else GError *error = NULL; if (priv->iochan) { *************** *** 91,94 **** --- 165,169 ---- else if (priv->fd >= 0) close(priv->fd); + #endif priv->file = NULL; priv->fd = -1; *************** *** 162,166 **** $GPGGA,184424.505,4924.2811,N,01107.8846,E,1,05,2.5,408.6,M,,,,0000*0C UTC of Fix[1],Latitude[2],N/S[3],Longitude[4],E/W[5],Quality(0=inv,1=gps,2=dgps)[6],Satelites used[7], ! HDOP[8],Altitude[9],"M"[10],height of geoid[11], "M"[12], time since dgps update[13], dgps ref station [14] */ sscanf(item[2], "%lf", &lat); --- 237,241 ---- $GPGGA,184424.505,4924.2811,N,01107.8846,E,1,05,2.5,408.6,M,,,,0000*0C UTC of Fix[1],Latitude[2],N/S[3],Longitude[4],E/W[5],Quality(0=inv,1=gps,2=dgps)[6],Satelites used[7], ! HDOP[8],Altitude[9],"M"[10],height of geoid[11], "M"[12], time since dgps update[13], dgps ref station [14] */ sscanf(item[2], "%lf", &lat); *************** *** 179,182 **** --- 254,259 ---- callback_list_call_0(priv->cbl); + + #ifndef _WIN32 if (priv->file_type == file_type_file) { vehicle_file_disable_watch(priv); *************** *** 185,192 **** priv); } } if (!strncmp(buffer, "$GPVTG", 6)) { ! /* 0 1 2 34 5 6 7 8 ! $GPVTG,143.58,T,,M,0.26,N,0.5,K*6A Course Over Ground Degrees True[1],"T"[2],Course Over Ground Degrees Magnetic[3],"M"[4], Speed in Knots[5],"N"[6],"Speed in KM/H"[7],"K"[8] --- 262,270 ---- priv); } + #endif } if (!strncmp(buffer, "$GPVTG", 6)) { ! /* 0 1 2 34 5 6 7 8 ! $GPVTG,143.58,T,,M,0.26,N,0.5,K*6A Course Over Ground Degrees True[1],"T"[2],Course Over Ground Degrees Magnetic[3],"M"[4], Speed in Knots[5],"N"[6],"Speed in KM/H"[7],"K"[8] *************** *** 198,202 **** /* 1 1 0 1 2 3 4 5 6 7 8 9 0 1 ! $GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W*6A Time[1],Active/Void[2],lat[3],N/S[4],long[5],W/E[6],speed in knots[7],track angle[8],date[9], magnetic variation[10],magnetic variation direction[11] --- 276,280 ---- /* 1 1 0 1 2 3 4 5 6 7 8 9 0 1 ! $GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W*6A Time[1],Active/Void[2],lat[3],N/S[4],long[5],W/E[6],speed in knots[7],track angle[8],date[9], magnetic variation[10],magnetic variation direction[11] *************** *** 208,211 **** --- 286,290 ---- } + #ifndef _WIN32 static gboolean vehicle_file_io(GIOChannel * iochan, GIOCondition condition, gpointer t) *************** *** 252,262 **** --- 331,346 ---- return FALSE; } + #endif static void vehicle_file_enable_watch(struct vehicle_priv *priv) { + #ifdef _WIN32 + g_timeout_add(500, vehicle_win32_serial_track, priv); + #else priv->watch = g_io_add_watch(priv->iochan, G_IO_IN | G_IO_ERR | G_IO_HUP, vehicle_file_io, priv); + #endif } *************** *** 264,270 **** --- 348,356 ---- vehicle_file_disable_watch(struct vehicle_priv *priv) { + #ifndef _WIN32 if (priv->watch) g_source_remove(priv->watch); priv->watch = 0; + #endif } *************** *** 333,336 **** --- 419,425 ---- return ret; } + #ifdef _WIN32 + ret->no_data_count = 0; + #endif dbg(0, "Failed to open '%s'\n", ret->source); vehicle_file_destroy(ret); |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:33:21
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32549 Modified Files: serial_io.c Log Message: added serial support for win32 Index: serial_io.c =================================================================== RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/serial_io.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** serial_io.c 7 Jan 2008 22:11:08 -0000 1.1 --- serial_io.c 7 Jan 2008 22:33:20 -0000 1.2 *************** *** 40,44 **** // Free the buffer. LocalFree( lpMsgBuf ); ! return 0; } --- 40,44 ---- // Free the buffer. LocalFree( lpMsgBuf ); ! return -1; } |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:11:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22884/Win32Extra/sys Added Files: mman.c mman.h Log Message: added win32 port related files, for time being use CodeBlocks project file --- NEW FILE: mman.c --- #include <windows.h> #include "mman.h" void * mmap_file_readonly( const char* name ) { void * mapped_ptr = NULL; OFSTRUCT of; HFILE hFile = OpenFile (name, &of, OF_READ); if ( hFile != HFILE_ERROR ) { HANDLE hMapping = CreateFileMapping ( (HANDLE)hFile, NULL, PAGE_READONLY, 0, 0, NULL); mapped_ptr = MapViewOfFile(hMapping, FILE_MAP_READ, 0 , 0, 0 ); } return mapped_ptr; } --- NEW FILE: mman.h --- #ifndef _SYS_MAN_H_INCLUDED #define _SYS_MAN_H_INCLUDED void * mmap_file_readonly( const char* name ); #endif /* !_SYS_MAN_H_INCLUDED */ |
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22884 Added Files: Navit.cbp Navit.new.cbp Navit.workspace NavitCommonLib.cbp Navit_no_plugin.cbp Osm2Navit.cbp binfile.cbp data_poi_geodownload.cbp fib-1.1.cbp gtk_graphics.cbp gtk_gui.cbp gui_sdl.cbp libgarmin.cbp make_builtin makefile_langfiles mdb.cbp vehicle_demo.cbp vehicle_file.cbp Log Message: added win32 port related files, for time being use CodeBlocks project file --- NEW FILE: Navit.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="Navit" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="bin\Debug\Navi" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add library="bin\Debug\libfib.a" /> <Add library="bin\Debug\libvehicle_file.la" /> <Add library="bin\Debug\libdata_binfile.la" /> <Add library="bin\Debug\libgtk_graphics.la" /> <Add library="bin\Debug\libgtk_gui.la" /> <Add library="bin\Debug\libvehicle_demo.la" /> <Add library="bin\Debug\libdata_poi_geodownload.la" /> <Add library="bin\Debug\libmdb.a" /> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gdk-win32-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="freetype" /> <Add library="z" /> <Add library="gobject-2.0" /> <Add library="gmodule-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output="bin\Release\Navit" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add library="bin\Release\libfib.a" /> <Add library="bin\Release\libvehicle_file.la" /> <Add library="bin\Release\libdata_binfile.la" /> <Add library="bin\Release\libgtk_graphics.la" /> <Add library="bin\Release\libgtk_gui.la" /> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gdk-win32-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="freetype" /> <Add library="z" /> <Add library="gobject-2.0" /> <Add library="gmodule-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields" /> <Add option="-DMODULE=Navit" /> <Add option='-DPREFIX=\"/usr/local\"' /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> <Add directory="..\..\src\fib-1.1" /> <Add directory="D:\msys\1.10\freetype-2.3.5\include" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" /> </Linker> <Unit filename="Win32Extra\builtin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\config.h" /> <Unit filename="Win32Extra\serial_io.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\serial_io.h" /> <Unit filename="Win32Extra\setenv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\setenv.h" /> <Unit filename="Win32Extra\wordexp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\wordexp.h" /> <Unit filename="..\..\src\Makefile" /> <Unit filename="..\..\src\Makefile.am" /> <Unit filename="..\..\src\Makefile.in" /> <Unit filename="..\..\src\attr.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\attr.h" /> <Unit filename="..\..\src\attr_def.h" /> <Unit filename="..\..\src\callback.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\callback.h" /> <Unit filename="..\..\src\color.h" /> <Unit filename="..\..\src\compass.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\compass.h" /> <Unit filename="..\..\src\coord.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\coord.h" /> <Unit filename="..\..\src\country.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\country.h" /> <Unit filename="..\..\src\cursor.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\cursor.h" /> <Unit filename="..\..\src\data.h" /> <Unit filename="..\..\src\data_window.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data_window.h" /> <Unit filename="..\..\src\data_window_int.h" /> <Unit filename="..\..\src\debug.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\debug.h" /> <Unit filename="..\..\src\destination.h" /> <Unit filename="..\..\src\draw_info.h" /> <Unit filename="..\..\src\file.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\file.h" /> <Unit filename="..\..\src\graphics.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\graphics.h" /> <Unit filename="..\..\src\gtkext.h" /> <Unit filename="..\..\src\gui.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui.h" /> <Unit filename="..\..\src\gui\gtk\gui_gtk.h" /> <Unit filename="..\..\src\item.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\item.h" /> <Unit filename="..\..\src\item_def.h" /> <Unit filename="..\..\src\layer.h" /> <Unit filename="..\..\src\layout.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\layout.h" /> <Unit filename="..\..\src\log.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\log.h" /> <Unit filename="..\..\src\main.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\main.h" /> <Unit filename="..\..\src\map-share.h" /> <Unit filename="..\..\src\map.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\map.h" /> <Unit filename="..\..\src\map_data.h" /> <Unit filename="..\..\src\mapset.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\mapset.h" /> <Unit filename="..\..\src\maptype.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\maptype.h" /> <Unit filename="..\..\src\menu.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\menu.h" /> <Unit filename="..\..\src\navigation.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\navigation.h" /> <Unit filename="..\..\src\navit.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\navit.h" /> <Unit filename="..\..\src\navit.xml" /> <Unit filename="..\..\src\osd.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\osd.h" /> <Unit filename="..\..\src\param.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\param.h" /> <Unit filename="..\..\src\phrase.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\phrase.h" /> <Unit filename="..\..\src\plugin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\plugin.h" /> <Unit filename="..\..\src\plugin_def.h" /> <Unit filename="..\..\src\point.h" /> <Unit filename="..\..\src\popup.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\popup.h" /> <Unit filename="..\..\src\profile.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\profile.h" /> <Unit filename="..\..\src\projection.h" /> <Unit filename="..\..\src\route.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\route.h" /> <Unit filename="..\..\src\search.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\search.h" /> <Unit filename="..\..\src\speech.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\speech.h" /> <Unit filename="..\..\src\statusbar.h" /> <Unit filename="..\..\src\track.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\track.h" /> <Unit filename="..\..\src\transform.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\transform.h" /> <Unit filename="..\..\src\util.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\util.h" /> <Unit filename="..\..\src\vehicle.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\vehicle.h" /> <Unit filename="..\..\src\xmlconfig.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\xmlconfig.h" /> <Unit filename="..\..\src\zipfile.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: gtk_graphics.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="gtk_graphics" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\lib_gtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\lib_gtk_graphics.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=GTKGRAPHICS" /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> </Compiler> <Linker> <Add library="NavitCommonLib" /> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\graphics\gtk_drawing_area\graphics_gtk_drawing_area.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: data_poi_geodownload.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="data_poi_geodownload" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libdata_poi_geodownload.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libdata_poi_geodownload.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=data_poi_geodownload" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="..\..\" /> <Add directory="..\" /> <Add directory="D:\CB_Projects\Navit\src\" /> <Add directory="Win32Extra" /> <Add directory="..\..\src" /> <Add directory="..\..\src\data\poi_geodownload\libmdb\include" /> </Compiler> <Linker> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\data\poi_geodownload\poi_geodownload.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: Navit.workspace --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_workspace_file> <Workspace title="Navit"> <Project filename="fib-1.1.cbp" /> <Project filename="mdb.cbp" /> <Project filename="data_poi_geodownload.cbp"> <Depends filename="mdb.cbp" /> </Project> <Project filename="binfile.cbp" /> <Project filename="vehicle_demo.cbp" /> <Project filename="vehicle_file.cbp" /> <Project filename="Osm2Navit.cbp" /> <Project filename="Navit.cbp" active="1"> <Depends filename="fib-1.1.cbp" /> <Depends filename="mdb.cbp" /> <Depends filename="data_poi_geodownload.cbp" /> <Depends filename="binfile.cbp" /> <Depends filename="vehicle_demo.cbp" /> <Depends filename="vehicle_file.cbp" /> <Depends filename="gtk_gui.cbp" /> <Depends filename="gtk_graphics.cbp" /> </Project> <Project filename="gtk_gui.cbp" /> <Project filename="gtk_graphics.cbp" /> </Workspace> </CodeBlocks_workspace_file> --- NEW FILE: make_builtin --- builtin.c: ls *.la | sed -e "s/.la/_init(void);/" -e "s/.*lib/extern void module_/" >builtin.c echo "extern void builtin_init(void);" >>builtin.c echo "void builtin_init(void) {" >>builtin.c ls *.la | sed -e "s/.la/_init();/" -e "s/.*lib/ module_/" >>builtin.c echo "}" >>builtin.c --- NEW FILE: gui_sdl.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="gui_sdl" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libgui_sdl.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libgui_sdl.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=gui_sdl" /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> <Add directory="D:\msys\local\include" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\gui\sdl\Makefile.am" /> <Unit filename="..\..\src\gui\sdl\Makefile.in" /> <Unit filename="..\..\src\gui\sdl\cegui_keyboard.cpp" /> <Unit filename="..\..\src\gui\sdl\cegui_keyboard.h" /> <Unit filename="..\..\src\gui\sdl\gui_sdl.h" /> <Unit filename="..\..\src\gui\sdl\gui_sdl_window.cpp" /> <Unit filename="..\..\src\gui\sdl\sdl_events.cpp" /> <Unit filename="..\..\src\gui\sdl\sdl_events.h" /> <Unit filename="..\..\src\gui\sdl\wmcontrol.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\sdl\wmcontrol.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: fib-1.1.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="fib-1.1" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libfib.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> <Option object_output="obj\fib-1.1\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> <Add option="-I." /> </Compiler> </Target> <Target title="Release"> <Option output=".\bin\Release\libfib.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> <Option object_output="obj\fib-1.1\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add directory="..\..\src\fib-1.1" /> </Compiler> <Unit filename="..\..\src\fib-1.1\fib.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\fib-1.1\fib.h" /> <Unit filename="..\..\src\fib-1.1\fibpriv.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: Osm2Navit.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="Osm2Navit" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="bin\Debug\Osm2Navit" prefix_auto="1" extension_auto="1" /> <Option working_dir="bin\Debug" /> <Option object_output="obj\osm2navit\Debug\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Option parameters="--input-file=d:\CB_Projects\netherlands.osm --attr-debug-level=0 -k netherlands.bin" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output="bin\Release\Osm2Navit" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\osm2navit\Release\" /> <Option type="1" /> <Option compiler="gcc" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields -DMODULE=osm2navit" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include" /> <Add directory="Win32Extra" /> </Compiler> <Linker> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gdk-win32-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="fib" /> <Add library="freetype" /> <Add library="z" /> <Add library="gobject-2.0" /> <Add library="gmodule-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> <Add library="zdll" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="Win32Extra\wordexp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\wordexp.h" /> <Unit filename="..\..\src\attr.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\attr.h" /> <Unit filename="..\..\src\attr_def.h" /> <Unit filename="..\..\src\coord.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\coord.h" /> <Unit filename="..\..\src\country.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\country.h" /> <Unit filename="..\..\src\debug.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\debug.h" /> <Unit filename="..\..\src\file.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\file.h" /> <Unit filename="..\..\src\item.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\item.h" /> <Unit filename="..\..\src\map.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\map.h" /> <Unit filename="..\..\src\osm2navit.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\param.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\param.h" /> <Unit filename="..\..\src\plugin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\plugin.h" /> <Unit filename="..\..\src\transform.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\transform.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: Navit.new.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="Navit" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="bin\Debug\Navi" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output="bin\Release\Navit" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="1" /> <Option compiler="gcc" /> <Option use_console_runner="0" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields" /> <Add option="-DMODULE=Navit" /> <Add option='-DPREFIX=\"/usr/local\"' /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> <Add directory="..\..\src\fib-1.1" /> <Add directory="D:\msys\1.10\freetype-2.3.5\include" /> </Compiler> <Linker> <Add library="bin\Debug\libgtk_graphics.la" /> <Add library="bin\Debug\libgtk_gui.la" /> <Add library="bin\Debug\libdata_binfile.la" /> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gdk-win32-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="fib" /> <Add library="freetype" /> <Add library="z" /> <Add library="gobject-2.0" /> <Add library="gmodule-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> <Add library="bin\Debug\libvehicle_file.la" /> <Add directory="d:\gtk\lib" /> <Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" /> </Linker> <Unit filename="Win32Extra\config.h" /> <Unit filename="Win32Extra\serial_io.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\serial_io.h" /> <Unit filename="Win32Extra\setenv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\setenv.h" /> <Unit filename="Win32Extra\wordexp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\wordexp.h" /> <Unit filename="..\..\src\Makefile" /> <Unit filename="..\..\src\Makefile.am" /> <Unit filename="..\..\src\Makefile.in" /> <Unit filename="..\..\src\attr.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\attr.h" /> <Unit filename="..\..\src\attr_def.h" /> <Unit filename="..\..\src\builtin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\callback.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\callback.h" /> <Unit filename="..\..\src\color.h" /> <Unit filename="..\..\src\compass.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\compass.h" /> <Unit filename="..\..\src\coord.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\coord.h" /> <Unit filename="..\..\src\country.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\country.h" /> <Unit filename="..\..\src\cursor.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\cursor.h" /> <Unit filename="..\..\src\data.h" /> <Unit filename="..\..\src\data_window.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data_window.h" /> <Unit filename="..\..\src\data_window_int.h" /> <Unit filename="..\..\src\debug.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\debug.h" /> <Unit filename="..\..\src\destination.h" /> <Unit filename="..\..\src\draw_info.h" /> <Unit filename="..\..\src\file.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\file.h" /> <Unit filename="..\..\src\graphics.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\graphics.h" /> <Unit filename="..\..\src\gtkext.h" /> <Unit filename="..\..\src\gui.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui.h" /> <Unit filename="..\..\src\gui\gtk\gui_gtk.h" /> <Unit filename="..\..\src\item.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\item.h" /> <Unit filename="..\..\src\item_def.h" /> <Unit filename="..\..\src\layer.h" /> <Unit filename="..\..\src\layout.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\layout.h" /> <Unit filename="..\..\src\log.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\log.h" /> <Unit filename="..\..\src\main.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\main.h" /> <Unit filename="..\..\src\map-share.h" /> <Unit filename="..\..\src\map.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\map.h" /> <Unit filename="..\..\src\map_data.h" /> <Unit filename="..\..\src\mapset.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\mapset.h" /> <Unit filename="..\..\src\maptype.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\maptype.h" /> <Unit filename="..\..\src\menu.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\menu.h" /> <Unit filename="..\..\src\navigation.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\navigation.h" /> <Unit filename="..\..\src\navit.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\navit.h" /> <Unit filename="..\..\src\navit.xml" /> <Unit filename="..\..\src\osd.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\osd.h" /> <Unit filename="..\..\src\param.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\param.h" /> <Unit filename="..\..\src\phrase.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\phrase.h" /> <Unit filename="..\..\src\plugin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\plugin.h" /> <Unit filename="..\..\src\plugin_def.h" /> <Unit filename="..\..\src\point.h" /> <Unit filename="..\..\src\popup.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\popup.h" /> <Unit filename="..\..\src\profile.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\profile.h" /> <Unit filename="..\..\src\projection.h" /> <Unit filename="..\..\src\route.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\route.h" /> <Unit filename="..\..\src\search.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\search.h" /> <Unit filename="..\..\src\speech.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\speech.h" /> <Unit filename="..\..\src\statusbar.h" /> <Unit filename="..\..\src\track.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\track.h" /> <Unit filename="..\..\src\transform.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\transform.h" /> <Unit filename="..\..\src\util.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\util.h" /> <Unit filename="..\..\src\vehicle.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\vehicle.h" /> <Unit filename="..\..\src\xmlconfig.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\xmlconfig.h" /> <Unit filename="..\..\src\zipfile.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: mdb.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="mdb" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libmdb.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> <Option object_output="obj\mdb\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> <Add option="-I." /> </Compiler> </Target> <Target title="Release"> <Option output=".\bin\Release\libmdb.a" prefix_auto="0" extension_auto="0" /> <Option working_dir="" /> <Option object_output="obj\mdb\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add directory="..\..\src\data\poi_geodownload\libmdb\include" /> </Compiler> <Unit filename="..\..\src\data\poi_geodownload\libmdb\backend.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\catalog.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\data.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\dump.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\file.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\iconv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\index.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\kkd.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\like.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\map.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\mem.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\money.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\options.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\props.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\sargs.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\stats.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\table.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\worktable.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\data\poi_geodownload\libmdb\write.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: gtk_gui.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="gtk_gui" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libgtk_gui.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libgtk_gui.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=gtk_gui" /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\gui\gtk\datawindow.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\destination.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk.h" /> <Unit filename="..\..\src\gui\gtk\gui_gtk_action.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk_statusbar.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk_window.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: vehicle_demo.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="vehicle_demo" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libvehicle_demo.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libvehicle_demo.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=vehicle_demo" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="..\..\" /> <Add directory="..\" /> <Add directory="D:\CB_Projects\Navit\src\" /> <Add directory="Win32Extra" /> <Add directory="..\..\src" /> </Compiler> <Linker> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\vehicle\demo\vehicle_demo.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: vehicle_file.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="vehicle_file" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libvehicle_file.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libvehicle_file.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=vehicle_file" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="..\..\" /> <Add directory="..\" /> <Add directory="D:\CB_Projects\Navit\src\" /> <Add directory="Win32Extra" /> <Add directory="..\..\src" /> </Compiler> <Linker> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\vehicle\file\vehicle_file.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: Navit_no_plugin.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="gui_gtk" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="bin\Debug\gui_gtk" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Option createStaticLib="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output="bin\Release\gui_gtk" prefix_auto="1" extension_auto="1" /> <Option object_output="obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Option createStaticLib="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-DBUILD_DLL" /> <Add option='-DMODULE=\"Navit\"' /> <Add directory="D:\gtk\include" /> <Add directory="D:\gtk\include\gtk-2.0" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\gtk-2.0\include" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="D:\gtk\include\cairo" /> <Add directory="D:\gtk\include\pango-1.0" /> <Add directory="D:\gtk\include\atk-1.0" /> <Add directory="..\..\src" /> <Add directory="Win32Extra" /> </Compiler> <Linker> <Add library="NavitCommonLib" /> <Add library="user32" /> <Add library="gtk-win32-2.0" /> <Add library="gobject-2.0" /> <Add library="gdk_pixbuf-2.0" /> <Add library="glib-2.0" /> <Add library="intl" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="main.cpp" /> <Unit filename="main.h" /> <Unit filename="..\..\src\gui\gtk\datawindow.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\destination.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk.h" /> <Unit filename="..\..\src\gui\gtk\gui_gtk_action.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk_statusbar.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\src\gui\gtk\gui_gtk_window.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: makefile_langfiles --- POFILES = cs.mo es.mo fr.mo nl.mo pl.mo de.mo fi.mo it.mo no.mo MSGFMT=msgfmt.exe %.mo:../../po/%.po $(MSGFMT) --check --verbose --statistics --output-file=$@ $< && \ mkdir -p ./locale/$(basename $@)/LC_MESSAGES && \ mv $@ ./locale/$(basename $@)/LC_MESSAGES/navit.mo .PHONY: all clean # nl.po: ..\..\nl.mo all: $(POFILES) clean: rm -rf locale/* --- NEW FILE: NavitCommonLib.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="NavitCommon" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\NavitCommonLib" prefix_auto="1" extension_auto="1" /> <Option working_dir=".\bin\Debug" /> <Option object_output=".\obj\Debug\" /> <Option type="3" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> </Target> <Target title="Release"> <Option output=".\bin\Release\NavitCommonLib" prefix_auto="1" extension_auto="1" /> <Option working_dir=".\bin\Release" /> <Option object_output=".\obj\Release\" /> <Option type="3" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields" /> <Add option='-DMODULE=\"Navit\"' /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="Win32Extra" /> <Add directory="D:\gtk\include" /> </Compiler> <Linker> <Add library="glib-2.0" /> <Add library="z" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="Win32Extra\setenv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\setenv.h" /> <Unit filename="Win32Extra\sys\mman.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\sys\mman.h" /> <Unit filename="Win32Extra\wordexp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="Win32Extra\wordexp.h" /> <Unit filename="..\..\src\callback.h" /> <Unit filename="..\..\src\debug.h" /> <Unit filename="..\..\src\file.h" /> <Unit filename="..\..\src\item.h" /> <Unit filename="..\..\src\map.h" /> <Unit filename="..\..\src\param.h" /> <Unit filename="..\..\src\search.h" /> <Unit filename="..\..\src\transform.h" /> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: libgarmin.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="libgarmin" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output="libgarmin" prefix_auto="1" extension_auto="1" /> <Option working_dir="" /> <Option object_output="obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> </Target> <Target title="Release"> <Option output="libgarmin" prefix_auto="1" extension_auto="1" /> <Option working_dir="" /> <Option object_output="obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> </Compiler> <Unit filename="..\..\..\libgarmin\src\GarminTypedef.h" /> <Unit filename="..\..\..\libgarmin\src\array.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\array.h" /> <Unit filename="..\..\..\libgarmin\src\bsp.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\bsp.h" /> <Unit filename="..\..\..\libgarmin\src\garmin.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_fat.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_fat.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_lbl.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_lbl.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_net.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_net.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_obj.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_order.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_order.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_rgn.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_rgn.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_subdiv.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_subdiv.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_tdb.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\garmin_tdb.h" /> <Unit filename="..\..\..\libgarmin\src\garmin_typ.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\geoutils.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\geoutils.h" /> <Unit filename="..\..\..\libgarmin\src\libgarmin.h" /> <Unit filename="..\..\..\libgarmin\src\libgarmin_priv.h" /> <Unit filename="..\..\..\libgarmin\src\list.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="..\..\..\libgarmin\src\list.h" /> <Unit filename="main.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> --- NEW FILE: binfile.cbp --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_project_file> <FileVersion major="1" minor="6" /> <Project> <Option title="binfile" /> <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> <Target title="Debug"> <Option output=".\bin\Debug\libdata_binfile.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Debug\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-g" /> </Compiler> <Linker> <Add directory="d:\gtk\lib" /> <Add directory="bin\Debug" /> </Linker> </Target> <Target title="Release"> <Option output=".\bin\Release\libdata_binfile.la" prefix_auto="1" extension_auto="0" /> <Option working_dir="" /> <Option object_output=".\obj\Release\" /> <Option type="2" /> <Option compiler="gcc" /> <Option createDefFile="1" /> <Compiler> <Add option="-O2" /> </Compiler> <Linker> <Add option="-s" /> <Add directory="d:\gtk\lib" /> <Add directory="bin\Release" /> </Linker> </Target> </Build> <Compiler> <Add option="-Wall" /> <Add option="-mms-bitfields `pkg-config --cflags --libs glib-2.0`" /> <Add option="-DBUILD_DLL" /> <Add option="-DMODULE=data_binfile" /> <Add directory="D:\gtk\include\glib-2.0" /> <Add directory="D:\gtk\lib\glib-2.0\include" /> <Add directory="..\..\" /> <Add directory="..\" /> <Add directory="D:\CB_Projects\Navit\src\" /> <Add directory="Win32Extra" /> <Add directory="..\..\src" /> </Compiler> <Linker> <Add library="NavitCommonLib" /> <Add library="glib-2.0" /> <Add library="user32" /> <Add library="intl" /> <Add library="iconv" /> <Add directory="d:\gtk\lib" /> </Linker> <Unit filename="..\..\src\data\binfile\binfile.c"> <Option compilerVar="CC" /> </Unit> <Extensions> <code_completion /> <envvars /> <debugger /> </Extensions> </Project> </CodeBlocks_project_file> |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:11:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22884/Win32Extra Added Files: LiberationSans-Regular.ttf builtin.c config.h serial_io.c serial_io.h setenv.c setenv.h wordexp.c wordexp.h Log Message: added win32 port related files, for time being use CodeBlocks project file --- NEW FILE: config.h --- /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* Define to avoid floating point */ /* #undef AVOID_FLOAT */ /* Define to avoid unaligned access */ /* #undef AVOID_UNALIGNED */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ /* #undef CRAY_STACKSEG_END */ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ /* Define to 1 if translation of program messages to the user's native language is requested. */ #define ENABLE_NLS 1 /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). */ #define HAVE_ALLOCA_H 1 /* Define to 1 if you have the `argz_count' function. */ #define HAVE_ARGZ_COUNT 1 /* Define to 1 if you have the <argz.h> header file. */ #define HAVE_ARGZ_H 1 /* Define to 1 if you have the `argz_next' function. */ #define HAVE_ARGZ_NEXT 1 /* Define to 1 if you have the `argz_stringify' function. */ #define HAVE_ARGZ_STRINGIFY 1 /* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 /* Define to 1 if the compiler understands __builtin_expect. */ #define HAVE_BUILTIN_EXPECT 1 /* Define to 1 if you have the [CEGUI/CEGUI.h] header file. */ /* #undef HAVE_CEGUI */ /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ /* #undef HAVE_CFLOCALECOPYCURRENT */ /* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ /* Define if the GNU dcgettext() function is already present or preinstalled. */ #define HAVE_DCGETTEXT 1 /* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you don't. */ #define HAVE_DECL_FEOF_UNLOCKED 0 /* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if you don't. */ #define HAVE_DECL_FGETS_UNLOCKED 0 /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you don't. */ #define HAVE_DECL_GETC_UNLOCKED 1 /* Define to 1 if you have the declaration of `_snprintf', and to 0 if you don't. */ #define HAVE_DECL__SNPRINTF 0 /* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you don't. */ #define HAVE_DECL__SNWPRINTF 0 /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 /* Define to 1 if you have imlib2 */ #define HAVE_FREETYPE2 1 /* Define to 1 if you have the `fwprintf' function. */ /* #undef HAVE_FWPRINTF */ /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 /* Define to 1 if you have the `getegid' function. */ #define HAVE_GETEGID 1 /* Define to 1 if you have the `geteuid' function. */ #define HAVE_GETEUID 1 /* Define to 1 if you have the `getgid' function. */ #define HAVE_GETGID 1 /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 /* Define to 1 if you have the <GL/glc.h> header file. */ /* #undef HAVE_GLC */ /* Define to 1 if you have the <GL/glut.h> header file. */ #define HAVE_GLUT /* Define to 1 if you have imlib2 */ #define HAVE_GTK2 1 /* Define if you have the iconv() function. */ #define HAVE_ICONV 1 /* Define to 1 if you have imlib2 */ /* #undef HAVE_IMLIB2 */ /* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ #define HAVE_INTMAX_T 1 /* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */ #define HAVE_INTTYPES_H 1 /* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. */ #define HAVE_INTTYPES_H_WITH_UINTMAX 1 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ #define HAVE_LANGINFO_CODESET 1 /* Define if your <locale.h> file defines LC_MESSAGES. */ #define HAVE_LC_MESSAGES 1 /* Define to 1 if you have the `CEGUIBase' library (-lCEGUIBase). */ /* #undef HAVE_LIBCEGUIBASE */ /* Define to 1 if you have the `CEGUIFalagardWRBase' library (-lCEGUIFalagardWRBase). */ /* #undef HAVE_LIBCEGUIFALAGARDWRBASE */ /* Define to 1 if you have the `CEGUIOpenGLRenderer' library (-lCEGUIOpenGLRenderer). */ /* #undef HAVE_LIBCEGUIOPENGLRENDERER */ /* Define to 1 if you have the <gps.h> header file. */ /* #undef HAVE_LIBGPS */ /* Define to 1 if you have the <SDL/SDL.h> header file. */ /* #undef HAVE_LIBSDL */ /* Define to 1 if you have the <libspeechd.h> header file. */ /* #undef HAVE_LIBSPEECHD */ /* Define to 1 if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 /* Define if you have the 'long double' type. */ #define HAVE_LONG_DOUBLE 1 /* Define if you have the 'long long' type. */ #define HAVE_LONG_LONG 1 /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mempcpy' function. */ #define HAVE_MEMPCPY 1 /* Define to 1 if you have a working `mmap' system call. */ /* #undef HAVE_MMAP */ /* Define to 1 if you have the `munmap' function. */ #define HAVE_MUNMAP 1 /* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined. */ /* #undef HAVE_NL_LOCALE_NAME */ /* Define to 1 if you have the <GL/gl.h> header file. */ #define HAVE_OPENGL /* Define if your printf() function supports format strings with positions. */ #define HAVE_POSIX_PRINTF 1 /* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */ #define HAVE_PTHREAD_MUTEX_RECURSIVE 1 /* Define if the POSIX multithreading library has read/write locks. */ #define HAVE_PTHREAD_RWLOCK 1 /* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 /* Define to 1 if you have python */ #define HAVE_PYTHON 1 /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 /* Define to 1 if you have the <stddef.h> header file. */ #define HAVE_STDDEF_H 1 /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 /* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. */ #define HAVE_STDINT_H_WITH_UINTMAX 1 /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the `stpcpy' function. */ /* #undef HAVE_STPCPY */ /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 /* Define to 1 if you have the <strings.h> header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 /* Define to 1 if you have the <sys/param.h> header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the `tsearch' function. */ #define HAVE_TSEARCH 1 /* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */ #define HAVE_UINTMAX_T 1 /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 /* Define if you have the 'unsigned long long' type. */ #define HAVE_UNSIGNED_LONG_LONG 1 /* Define to 1 or 0, depending whether the compiler supports simple visibility declarations. */ #define HAVE_VISIBILITY 0 /* Define if you have the 'wchar_t' type. */ #define HAVE_WCHAR_T 1 /* Define to 1 if you have the `wcslen' function. */ #define HAVE_WCSLEN 1 /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 /* Define to 1 if you have the <zlib.h> header file. */ #define HAVE_ZLIB /* Define to 1 if you have the `__fsetlocking' function. */ /* #undef HAVE___FSETLOCKING */ /* Define as const if the declaration of iconv() needs const. */ #define ICONV_CONST const /* Define if integer division by zero raises signal SIGFPE. */ #define INTDIV0_RAISES_SIGFPE 1 /* Name of package */ #define PACKAGE "navit" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ #define PACKAGE_NAME "navit" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "navit 0.0.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "navit" /* Define to the version of this package. */ #define PACKAGE_VERSION "0.0.3" /* Define if <inttypes.h> exists and defines unusable PRI* macros. */ /* #undef PRI_MACROS_BROKEN */ /* Define if the pthread_in_use() detection is hard. */ /* #undef PTHREAD_IN_USE_DETECTION_HARD */ /* Define as the maximum value of type 'size_t', if the system doesn't define it. */ /* #undef SIZE_MAX */ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define if the POSIX multithreading library can be used. */ #define USE_POSIX_THREADS 1 /* Define if references to the POSIX multithreading library should be made weak. */ /* #undef USE_POSIX_THREADS_WEAK */ /* Define if the GNU Pth multithreading library can be used. */ /* #undef USE_PTH_THREADS */ /* Define if references to the GNU Pth multithreading library should be made weak. */ /* #undef USE_PTH_THREADS_WEAK */ /* Define if the old Solaris multithreading library can be used. */ /* #undef USE_SOLARIS_THREADS */ /* Define if references to the old Solaris multithreading library should be made weak. */ /* #undef USE_SOLARIS_THREADS_WEAK */ /* Define if the Win32 multithreading API can be used. */ /* #undef USE_WIN32_THREADS */ /* Version number of package */ #define VERSION "0.0.3" /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus /* #undef inline */ #endif /* Define as the type of the result of subtracting two pointers, if the system doesn't define it. */ /* #undef ptrdiff_t */ /* Define to empty if the C compiler doesn't support this keyword. */ /* #undef signed */ /* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef size_t */ /* Define to unsigned long or unsigned long long if <stdint.h> and <inttypes.h> don't define. */ /* #undef uintmax_t */ #define __libc_lock_t gl_lock_t #define __libc_lock_define gl_lock_define #define __libc_lock_define_initialized gl_lock_define_initialized #define __libc_lock_init gl_lock_init #define __libc_lock_lock gl_lock_lock #define __libc_lock_unlock gl_lock_unlock #define __libc_lock_recursive_t gl_recursive_lock_t #define __libc_lock_define_recursive gl_recursive_lock_define #define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized #define __libc_lock_init_recursive gl_recursive_lock_init #define __libc_lock_lock_recursive gl_recursive_lock_lock #define __libc_lock_unlock_recursive gl_recursive_lock_unlock #define glthread_in_use libintl_thread_in_use #define glthread_lock_init libintl_lock_init #define glthread_lock_lock libintl_lock_lock #define glthread_lock_unlock libintl_lock_unlock #define glthread_lock_destroy libintl_lock_destroy #define glthread_rwlock_init libintl_rwlock_init #define glthread_rwlock_rdlock libintl_rwlock_rdlock #define glthread_rwlock_wrlock libintl_rwlock_wrlock #define glthread_rwlock_unlock libintl_rwlock_unlock #define glthread_rwlock_destroy libintl_rwlock_destroy #define glthread_recursive_lock_init libintl_recursive_lock_init #define glthread_recursive_lock_lock libintl_recursive_lock_lock #define glthread_recursive_lock_unlock libintl_recursive_lock_unlock #define glthread_recursive_lock_destroy libintl_recursive_lock_destroy #define glthread_once libintl_once #define glthread_once_call libintl_once_call #define glthread_once_singlethreaded libintl_once_singlethreaded #define index(a,b) strchr(a,b) #define strtok_r(s,d,p) strtok(s,d) #define alarm( a ) --- NEW FILE: serial_io.h --- #ifndef SERIAL_IO_H_INCLUDED #define SERIAL_IO_H_INCLUDED // wxString EnumSerialPort(int n); int serial_io_init( int port, int baudrate ); int serio_io_read(int fd, char * buffer, int buffer_size ); int WriteSerial(int fd, const char * buffer); void serial_io_shutdown(int fd ); // wxString GetLastSerialIOError(); #endif --- NEW FILE: serial_io.c --- #include <stdio.h> #include <windows.h> #include "serial_io.h" int serial_io_init( int port, int baudrate ) { HANDLE hCom = NULL; char strport[16]; snprintf( strport, sizeof( strport ), "\\\\.\\COM%d", port ); hCom = CreateFile( strport, GENERIC_WRITE | GENERIC_READ, 0, 0, OPEN_EXISTING, 0, NULL); if (hCom == INVALID_HANDLE_VALUE) { LPVOID lpMsgBuf; FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language (LPTSTR) &lpMsgBuf, 0, NULL ); char * tst = lpMsgBuf; // g_strSerialError = strPort + wxT(": ") + (LPTSTR) lpMsgBuf; // Free the buffer. LocalFree( lpMsgBuf ); return 0; } DCB dcb; ZeroMemory(&dcb, sizeof(DCB)); GetCommState(hCom, &dcb); char strsettings[255]; snprintf( strsettings, sizeof( strsettings ), "baud=%d parity=N data=8 stop=1", baudrate ); BuildCommDCB( strsettings, &dcb); SetupComm(hCom, 4096, 4096); SetCommState(hCom, &dcb); COMMTIMEOUTS sCT; memset(&sCT, 0, sizeof(sCT)); sCT.ReadTotalTimeoutConstant = 10; SetCommTimeouts(hCom, &sCT); return (int)hCom; } int serial_io_read( int fd, char * buffer, int buffer_size ) { DWORD dwBytesIn = 0; if (fd <= 0) { // Sleep(1000); *buffer = 0; return 0; } ReadFile( (HANDLE)fd, buffer, buffer_size - 1, &dwBytesIn, NULL); if (dwBytesIn > 0) { printf( "GPS < %s\n",buffer ); } if (dwBytesIn >= 0) { buffer[dwBytesIn] = 0; } else{ buffer[0] = 0; } buffer[buffer_size - 1] = 0; if (dwBytesIn <= 0) { Sleep(50); dwBytesIn = 0; } return dwBytesIn; } int serial_io_write(int fd, const char * buffer) { DWORD dwBytesOut = 0; WriteFile((HANDLE)fd, buffer, strlen(buffer), &dwBytesOut, NULL); return dwBytesOut; } void serial_io_shutdown(int fd ) { if (fd > 0) { CloseHandle((HANDLE)fd); } } --- NEW FILE: LiberationSans-Regular.ttf --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wordexp.h --- #ifndef _WORDEXP_H_ #define _WORDEXP_H_ typedef struct { size_t we_wordc; /* count of words matched */ char **we_wordv; /* pointer to list of words */ size_t we_offs; /* slots to reserve in we_wordv */ /* following are internals */ char *we_strings; /* storage for wordv strings */ size_t we_nbytes; /* size of we_strings */ } wordexp_t; /* * Flags for wordexp(). */ #define WRDE_APPEND 0x1 /* append to previously generated */ #define WRDE_DOOFFS 0x2 /* we_offs member is valid */ #define WRDE_NOCMD 0x4 /* disallow command substitution */ #define WRDE_REUSE 0x8 /* reuse wordexp_t */ #define WRDE_SHOWERR 0x10 /* don't redirect stderr to /dev/null */ #define WRDE_UNDEF 0x20 /* disallow undefined shell vars */ /* * Return values from wordexp(). */ #define WRDE_BADCHAR 1 /* unquoted special character */ #define WRDE_BADVAL 2 /* undefined variable */ #define WRDE_CMDSUB 3 /* command substitution not allowed */ #define WRDE_NOSPACE 4 /* no memory for result */ #if (_XOPEN_SOURCE - 0) >= 4 || defined(_NETBSD_SOURCE) #define WRDE_NOSYS 5 /* obsolete, reserved */ #endif #define WRDE_SYNTAX 6 /* shell syntax error */ #define WRDE_ERRNO 7 /* other errors see errno */ void wordfree(wordexp_t *); int wordexp(const char * words, wordexp_t * we, int flags); #endif /* !_WORDEXP_H_ */ --- NEW FILE: setenv.h --- #ifndef _SETENV_H_INCLUDED #define _SETENV_H_INCLUDED int setenv(const char *name, const char *value, int overwrite); #endif /* !_SETENV_H_INCLUDED */ --- NEW FILE: builtin.c --- extern void module_data_binfile_init(void); extern void module_data_poi_geodownload_init(void); extern void module_gtk_graphics_init(void); extern void module_gtk_gui_init(void); extern void module_vehicle_demo_init(void); extern void module_vehicle_file_init(void); extern void builtin_init(void); void builtin_init(void) { module_data_binfile_init(); module_data_poi_geodownload_init(); module_gtk_graphics_init(); module_gtk_gui_init(); module_vehicle_demo_init(); module_vehicle_file_init(); } --- NEW FILE: setenv.c --- #include <stdio.h> #include <stdlib.h> int setenv(const char *name, const char *value, int overwrite) { char strPutEnv[512]; char * hasKey = getenv ( name ); if ( ( overwrite != 0 ) || ( hasKey == NULL ) ) { snprintf( strPutEnv, sizeof( strPutEnv ), "%s=%s", name, value ); strPutEnv[ sizeof( strPutEnv ) - 1 ] = '\0'; _putenv( strPutEnv ); } return 0; } --- NEW FILE: wordexp.c --- #include <sys/types.h> #include <assert.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include "wordexp.h" int wordexp(const char * words, wordexp_t * we, int flags) { int error=0; assert(we != NULL); assert(words != NULL); we->we_wordc = 1; we->we_wordv = NULL; we->we_strings = NULL; we->we_nbytes = 0; we->we_wordv = malloc( we->we_wordc * sizeof( char* ) ); we->we_nbytes = strlen( words ) + 1; we->we_strings = malloc( we->we_nbytes ); we->we_wordv[0] = &we->we_strings[0]; // copy string & terminate memcpy( we->we_strings, words, we->we_nbytes -1 ); we->we_strings[ we->we_nbytes -1 ] = '\0'; return error; } void wordfree(wordexp_t *we) { assert(we != NULL); if ( we->we_wordv ) { free(we->we_wordv); } if ( we->we_strings ) { free(we->we_strings); } we->we_wordv = NULL; we->we_strings = NULL; we->we_nbytes = 0; we->we_wordc = 0; } |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:11:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/X11 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22884/Win32Extra/X11 Added Files: XF86keysym.h Log Message: added win32 port related files, for time being use CodeBlocks project file --- NEW FILE: XF86keysym.h --- /* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */ /* * XFree86 vendor specific keysyms. * * The XFree86 keysym range is 0x10080001 - 0x1008FFFF. * * When adding new entries, the xc/lib/XKeysymDB file should also be * updated to make the new entries visible to Xlib. */ /* * ModeLock * * This one is old, and not really used any more since XKB offers this * functionality. */ #define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */ /* * Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new * keysyms that don't fit into any of the groups below. * * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used, * and should be used first for new keysyms. * * Check in keysymdef.h for generic symbols before adding new XFree86-specific * symbols here. */ /* * Keys found on some "Internet" keyboards. */ #define XF86XK_Standby 0x1008FF10 #define XF86XK_AudioLowerVolume 0x1008FF11 #define XF86XK_AudioMute 0x1008FF12 #define XF86XK_AudioRaiseVolume 0x1008FF13 #define XF86XK_AudioPlay 0x1008FF14 #define XF86XK_AudioStop 0x1008FF15 #define XF86XK_AudioPrev 0x1008FF16 #define XF86XK_AudioNext 0x1008FF17 #define XF86XK_HomePage 0x1008FF18 #define XF86XK_Mail 0x1008FF19 #define XF86XK_Start 0x1008FF1A #define XF86XK_Search 0x1008FF1B #define XF86XK_AudioRecord 0x1008FF1C /* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */ #define XF86XK_Calculator 0x1008FF1D #define XF86XK_Memo 0x1008FF1E #define XF86XK_ToDoList 0x1008FF1F #define XF86XK_Calendar 0x1008FF20 #define XF86XK_PowerDown 0x1008FF21 #define XF86XK_ContrastAdjust 0x1008FF22 #define XF86XK_RockerUp 0x1008FF23 #define XF86XK_RockerDown 0x1008FF24 #define XF86XK_RockerEnter 0x1008FF25 /* Some more "Internet" keyboard symbols */ #define XF86XK_Back 0x1008FF26 #define XF86XK_Forward 0x1008FF27 #define XF86XK_Stop 0x1008FF28 #define XF86XK_Refresh 0x1008FF29 #define XF86XK_PowerOff 0x1008FF2A #define XF86XK_WakeUp 0x1008FF2B #define XF86XK_Eject 0x1008FF2C #define XF86XK_ScreenSaver 0x1008FF2D #define XF86XK_WWW 0x1008FF2E #define XF86XK_Sleep 0x1008FF2F #define XF86XK_Favorites 0x1008FF30 #define XF86XK_AudioPause 0x1008FF31 #define XF86XK_AudioMedia 0x1008FF32 #define XF86XK_MyComputer 0x1008FF33 #define XF86XK_VendorHome 0x1008FF34 #define XF86XK_LightBulb 0x1008FF35 #define XF86XK_Shop 0x1008FF36 #define XF86XK_History 0x1008FF37 #define XF86XK_OpenURL 0x1008FF38 #define XF86XK_AddFavorite 0x1008FF39 #define XF86XK_HotLinks 0x1008FF3A #define XF86XK_BrightnessAdjust 0x1008FF3B #define XF86XK_Finance 0x1008FF3C #define XF86XK_Community 0x1008FF3D #define XF86XK_AudioRewind 0x1008FF3E #define XF86XK_XF86BackForward 0x1008FF3F #define XF86XK_Launch0 0x1008FF40 #define XF86XK_Launch1 0x1008FF41 #define XF86XK_Launch2 0x1008FF42 #define XF86XK_Launch3 0x1008FF43 #define XF86XK_Launch4 0x1008FF44 #define XF86XK_Launch5 0x1008FF45 #define XF86XK_Launch6 0x1008FF46 #define XF86XK_Launch7 0x1008FF47 #define XF86XK_Launch8 0x1008FF48 #define XF86XK_Launch9 0x1008FF49 #define XF86XK_LaunchA 0x1008FF4A #define XF86XK_LaunchB 0x1008FF4B #define XF86XK_LaunchC 0x1008FF4C #define XF86XK_LaunchD 0x1008FF4D #define XF86XK_LaunchE 0x1008FF4E #define XF86XK_LaunchF 0x1008FF4F #define XF86XK_ApplicationLeft 0x1008FF50 #define XF86XK_ApplicationRight 0x1008FF51 #define XF86XK_Book 0x1008FF52 #define XF86XK_CD 0x1008FF53 #define XF86XK_Calculater 0x1008FF54 #define XF86XK_Clear 0x1008FF55 #define XF86XK_Close 0x1008FF56 #define XF86XK_Copy 0x1008FF57 #define XF86XK_Cut 0x1008FF58 #define XF86XK_Display 0x1008FF59 #define XF86XK_DOS 0x1008FF5A #define XF86XK_Documents 0x1008FF5B #define XF86XK_Excel 0x1008FF5C #define XF86XK_Explorer 0x1008FF5D #define XF86XK_Game 0x1008FF5E #define XF86XK_Go 0x1008FF5F #define XF86XK_iTouch 0x1008FF60 #define XF86XK_LogOff 0x1008FF61 #define XF86XK_Market 0x1008FF62 #define XF86XK_Meeting 0x1008FF63 #define XF86XK_MenuKB 0x1008FF65 #define XF86XK_MenuPB 0x1008FF66 #define XF86XK_MySites 0x1008FF67 #define XF86XK_New 0x1008FF68 #define XF86XK_News 0x1008FF69 #define XF86XK_OfficeHome 0x1008FF6A #define XF86XK_Open 0x1008FF6B #define XF86XK_Option 0x1008FF6C #define XF86XK_Paste 0x1008FF6D #define XF86XK_Phone 0x1008FF6E #define XF86XK_Q 0x1008FF70 #define XF86XK_Reply 0x1008FF72 #define XF86XK_Reload 0x1008FF73 #define XF86XK_RotateWindows 0x1008FF74 #define XF86XK_RotationPB 0x1008FF75 #define XF86XK_RotationKB 0x1008FF76 #define XF86XK_Save 0x1008FF77 #define XF86XK_ScrollUp 0x1008FF78 #define XF86XK_ScrollDown 0x1008FF79 #define XF86XK_ScrollClick 0x1008FF7A #define XF86XK_Send 0x1008FF7B #define XF86XK_Spell 0x1008FF7C #define XF86XK_SplitScreen 0x1008FF7D #define XF86XK_Support 0x1008FF7E #define XF86XK_TaskPane 0x1008FF7F #define XF86XK_Terminal 0x1008FF80 #define XF86XK_Tools 0x1008FF81 #define XF86XK_Travel 0x1008FF82 #define XF86XK_UserPB 0x1008FF84 #define XF86XK_User1KB 0x1008FF85 #define XF86XK_User2KB 0x1008FF86 #define XF86XK_Video 0x1008FF87 #define XF86XK_WheelButton 0x1008FF88 #define XF86XK_Word 0x1008FF89 #define XF86XK_Xfer 0x1008FF8A #define XF86XK_ZoomIn 0x1008FF8B #define XF86XK_ZoomOut 0x1008FF8C #define XF86XK_Away 0x1008FF8D #define XF86XK_Messenger 0x1008FF8E #define XF86XK_WebCam 0x1008FF8F #define XF86XK_MailForward 0x1008FF90 #define XF86XK_Pictures 0x1008FF91 #define XF86XK_Music 0x1008FF92 /* Keys for special action keys (hot keys) */ #define XF86XK_Switch_VT_1 0x1008FE01 #define XF86XK_Switch_VT_2 0x1008FE02 #define XF86XK_Switch_VT_3 0x1008FE03 #define XF86XK_Switch_VT_4 0x1008FE04 #define XF86XK_Switch_VT_5 0x1008FE05 #define XF86XK_Switch_VT_6 0x1008FE06 #define XF86XK_Switch_VT_7 0x1008FE07 #define XF86XK_Switch_VT_8 0x1008FE08 #define XF86XK_Switch_VT_9 0x1008FE09 #define XF86XK_Switch_VT_10 0x1008FE0A #define XF86XK_Switch_VT_11 0x1008FE0B #define XF86XK_Switch_VT_12 0x1008FE0C #define XF86XK_Ungrab 0x1008FE20 #define XF86XK_ClearGrab 0x1008FE21 #define XF86XK_Next_VMode 0x1008FE22 #define XF86XK_Prev_VMode 0x1008FE23 |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:10:49
|
Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22869 Modified Files: graphics_gtk_drawing_area.c Log Message: added win32 port related files, for time being use CodeBlocks project file Index: graphics_gtk_drawing_area.c =================================================================== RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** graphics_gtk_drawing_area.c 7 Jan 2008 13:24:36 -0000 1.23 --- graphics_gtk_drawing_area.c 7 Jan 2008 22:10:53 -0000 1.24 *************** *** 7,11 **** --- 7,14 ---- #include <Imlib2.h> #endif + + #ifndef _WIN32 #include <gdk/gdkx.h> + #endif #include "debug.h" #include "point.h" *************** *** 62,65 **** --- 65,71 ---- static char *fontpaths[]={ + #ifdef _WIN32 + "c:/windows/fonts", + #endif "/usr/share/fonts", "/usr/X11R6/lib/X11/fonts/msttcorefonts", *************** *** 290,293 **** --- 296,300 ---- }; + #ifndef _WIN32 static GdkImage * display_text_render_shadow(struct text_glyph *g) *************** *** 333,336 **** --- 340,386 ---- return ret; } + #else + static GdkImage * + display_text_render_shadow(struct text_glyph *g) + { + int mask0, mask1, mask2, x, y, w=g->w, h=g->h; + int str=(g->w+9)/8; + unsigned char *p, *pm=g->pixmap; + GdkImage *ret; + + ret=gdk_image_new( GDK_IMAGE_NORMAL , gdk_visual_get_system(), w+2, h+2); + + for (y = 0 ; y < h ; y++) { + p=ret->mem+str*y; + + mask0=0x4000; + mask1=0xe000; + mask2=0x4000; + for (x = 0 ; x < w ; x++) { + if (pm[x+y*w]) { + p[0]|=(mask0 >> 8); + if (mask0 & 0xff) + p[1]|=mask0; + + p[str]|=(mask1 >> 8); + if (mask1 & 0xff) + p[str+1]|=mask1; + p[str*2]|=(mask2 >> 8); + if (mask2 & 0xff) + p[str*2+1]|=mask2; + } + mask0 >>= 1; + mask1 >>= 1; + mask2 >>= 1; + if (!((mask0 >> 8) | (mask1 >> 8) | (mask2 >> 8))) { + mask0<<=8; + mask1<<=8; + mask2<<=8; + } + } + } + return ret; + } + #endif static struct text_render * |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:08:14
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/X11 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21892/X11 Log Message: Directory /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/X11 added to the repository |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:07:56
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21503/sys Log Message: Directory /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys added to the repository |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:07:37
|
Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21476/Win32Extra Log Message: Directory /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra added to the repository |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:05:10
|
Update of /cvsroot/navit/navit/projs/CodeBlocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20442/CodeBlocks Log Message: Directory /cvsroot/navit/navit/projs/CodeBlocks added to the repository |
|
From: Albert L F. <af...@us...> - 2008-01-07 22:04:51
|
Update of /cvsroot/navit/navit/projs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20029/projs Log Message: Directory /cvsroot/navit/navit/projs added to the repository |
|
From: Albert L F. <af...@us...> - 2008-01-07 21:46:28
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11797 Modified Files: file.c Log Message: support for win32 Index: file.c =================================================================== RCS file: /cvsroot/navit/navit/src/file.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** file.c 4 Jan 2008 22:10:10 -0000 1.10 --- file.c 7 Jan 2008 21:46:32 -0000 1.11 *************** *** 19,22 **** --- 19,26 ---- #endif + #ifndef O_BINARY + #define O_BINARY 0 + #endif + static struct file *file_list; *************** *** 29,33 **** if (! file) return file; ! file->fd=open(name, O_RDONLY|O_LARGEFILE); if (file->fd < 0) { g_free(file); --- 33,37 ---- if (! file) return file; ! file->fd=open(name, O_RDONLY|O_LARGEFILE | O_BINARY); if (file->fd < 0) { g_free(file); *************** *** 46,49 **** --- 50,57 ---- file_mmap(struct file *file) { + // not supported for WIN32 right now + #ifdef _WIN32 + return -1; + #else file->begin=mmap(NULL, file->size, PROT_READ|PROT_WRITE, MAP_PRIVATE, file->fd, 0); g_assert(file->begin != NULL); *************** *** 54,57 **** --- 62,66 ---- g_assert(file->begin != (void *)0xffffffff); file->end=file->begin+file->size; + #endif return 1; } *************** *** 145,148 **** --- 154,158 ---- file_remap_readonly(struct file *f) { + #ifndef _WIN32 void *begin; munmap(f->begin, f->size); *************** *** 150,153 **** --- 160,164 ---- if (f->begin != begin) printf("remap failed\n"); + #endif } *************** *** 155,158 **** --- 166,170 ---- file_remap_readonly_all(void) { + #ifndef _WIN32 struct file *f=file_list; int limit=1000; *************** *** 162,165 **** --- 174,178 ---- f=f->next; } + #endif } *************** *** 167,171 **** --- 180,186 ---- file_unmap(struct file *f) { + #ifndef _WIN32 munmap(f->begin, f->size); + #endif } *************** *** 248,252 **** { close(f->fd); ! munmap(f->begin, f->size); g_free(f->name); g_free(f); --- 263,271 ---- { close(f->fd); ! ! if ( f->begin != NULL ) ! { ! // AF FIXME munmap(f->begin, f->size); ! } g_free(f->name); g_free(f); |
|
From: Albert L F. <af...@us...> - 2008-01-07 21:28:53
|
Update of /cvsroot/navit/navit/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4007 Modified Files: navit.c Log Message: don't perform kill on win32 systems, not known and not required Index: navit.c =================================================================== RCS file: /cvsroot/navit/navit/src/navit.c,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** navit.c 5 Jan 2008 22:46:19 -0000 1.72 --- navit.c 7 Jan 2008 21:28:57 -0000 1.73 *************** *** 1328,1333 **** --- 1328,1335 ---- } + #ifndef _WIN32 if (this_->pid && nv->speed > 2) kill(this_->pid, SIGWINCH); + #endif if (this_->route && nv->update_curr == 1) navigation_update(this_->navigation, this_->route); |
13 messages has been excluded from this view by a project administrator.
