Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Paul F. <pg...@us...> - 2006-09-05 00:57:46
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10287 Modified Files: roadmap_linefont.c Log Message: protect against out-of-bound array accesses, and map high-bit-set iso-8859-1 chars to a close ascii equivalent. this is to prevent withering glares from one's travelling companion when roadmap crashes repeatedly while providing route guidance to a french-canadian destination. Index: roadmap_linefont.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_linefont.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_linefont.c 13 Aug 2006 15:24:17 -0000 1.5 --- roadmap_linefont.c 5 Sep 2006 00:57:42 -0000 1.6 *************** *** 104,108 **** typedef struct hershey_font { hershey_char hc[MAXCHARS]; ! short nchars; unsigned char miny, maxy; } hershey_font; --- 104,108 ---- typedef struct hershey_font { hershey_char hc[MAXCHARS]; ! unsigned short nchars; unsigned char miny, maxy; } hershey_font; *************** *** 114,117 **** --- 114,133 ---- const unsigned char romans_font[]; + static char isoconv_chars[] = + "AAAAAAECEEEEIIIIDNoooooxOUUUUYPBaaaaaaeceeeeiiiionooooo/ouuuuypy"; + #define ISOCONV_MIN 192 + + static int + isoconv(char c) + { + #if 0 + unsigned char uc = (unsigned char)c; + if (uc >= ISOCONV_MIN) + return isoconv_chars[uc - ISOCONV_MIN]; + else + #endif + return c; + } + /* this function scans an integer, using n characters of the input stream, ignoring newlines ... */ *************** *** 220,224 **** int len, scale; const char *t; ! int k; if (fontp == 0) { --- 236,240 ---- int len, scale; const char *t; ! unsigned int k; if (fontp == 0) { *************** *** 232,236 **** for (t = text; *t; t++) { ! k = *t - ' '; if (k < hf->nchars) { len += hf->hc[k].maxx - hf->hc[k].minx; --- 248,253 ---- for (t = text; *t; t++) { ! ! k = isoconv(*t) - ' '; if (k < hf->nchars) { len += hf->hc[k].maxx - hf->hc[k].minx; *************** *** 249,255 **** RoadMapGuiPoint *p, points[MAXPOINTS]; ! int i, k, len, height, xp, yp, count; long scale; const char *t; if (fontp == 0) { --- 266,273 ---- RoadMapGuiPoint *p, points[MAXPOINTS]; ! int i, len, height, xp, yp, count; long scale; const char *t; + unsigned int k; if (fontp == 0) { *************** *** 264,268 **** for (t = text; *t; t++) { ! k = *t - ' '; if (k < hf->nchars) { len += hf->hc[k].maxx - hf->hc[k].minx; --- 282,287 ---- for (t = text; *t; t++) { ! ! k = isoconv(*t) - ' '; if (k < hf->nchars) { len += hf->hc[k].maxx - hf->hc[k].minx; *************** *** 294,298 **** for (t = text; *t; t++) { ! k = *t - ' '; if (k >= hf->nchars) { continue; --- 313,317 ---- for (t = text; *t; t++) { ! k = isoconv(*t) - ' '; if (k >= hf->nchars) { continue; |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:57:48
|
Update of /cvsroot/roadmap/roadmap_editor/src/en_sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv980 Added Files: 200.wav 800.wav Arrive.wav KeepLeft.wav KeepRight.wav Straight.wav TurnLeft.wav TurnRight.wav license.txt m.wav rec_end.wav rec_start.wav within.wav Log Message: Import English voice. --- NEW FILE: TurnRight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Arrive.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rec_start.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: KeepRight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: m.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 200.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: within.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Straight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: KeepLeft.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 800.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: license.txt --- TERMS AND CONDITIONS BY DOWNLOADING, OPENING OR USING THESE FILES OR APPLICATIONS YOU ARE DEEMED TO HAVE READ AND ACCEPTED THESE TERMS AND CONDITIONS. IF YOU DISAGREE WITH ANY OF THEM DELETE ALL COPIES YOU HAVE. All files and applications were created by Andy Siddell an...@ma... and are © Copyright EMAP plc 2005 or their respective owners. You may download, use and distribute these files and applications for your own or others use without financial gain. You May Not accept payment for, or distribute these files or applications in any form that requires payment. You May Not distribute these files or applications as part of a sales package even if you state the items are free. You May Not Copy these files or applications to any form of removable storage and offer for sale in hole or part. You May Not sell these files or applications on any auction site including but not restricted to Ebay. You Must include in full any license agreement or copyright notice that accompanied any file or application if you distribute them --- NEW FILE: TurnLeft.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rec_end.wav --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:56:22
|
Update of /cvsroot/roadmap/roadmap_editor/src/en_sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv953/en_sound Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/en_sound added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:55:43
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv554 Added Files: FreeMap.vcp Log Message: FeeMap build. --- NEW FILE: FreeMap.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="FreeMap" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE ARMV4) Application" 0xa301 CFG=FreeMap - Win32 (WCE ARMV4) Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "FreeMap.vcn". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "FreeMap.vcn" CFG="FreeMap - Win32 (WCE ARMV4) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "FreeMap - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Application") !MESSAGE "FreeMap - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 CPP=clarm.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "FreeMap - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF # Begin Target # Name "FreeMap - Win32 (WCE ARMV4) Release" # Name "FreeMap - Win32 (WCE ARMV4) Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:54:59
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32640/FreeMap Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/FreeMap added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:54:25
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32616 Modified Files: roadmap_main.h Log Message: Support cursor control. Index: roadmap_main.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_main.h 9 Aug 2006 07:07:49 -0000 1.2 --- roadmap_main.h 4 Sep 2006 06:54:21 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- #include "roadmap_spawn.h" + #define ROADMAP_CURSOR_NORMAL 1 + #define ROADMAP_CURSOR_WAIT 2 + struct RoadMapFactoryKeyMap; *************** *** 78,81 **** --- 81,86 ---- void roadmap_main_exit (void); + void roadmap_main_set_cursor (int cursor); + #endif /* INCLUDE__ROADMAP_MAIN__H */ |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:54:08
|
Update of /cvsroot/roadmap/roadmap_editor/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32337 Modified Files: roadmap_main.c Log Message: Support cursor control. Index: roadmap_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_main.c 9 Aug 2006 07:32:16 -0000 1.3 --- roadmap_main.c 4 Sep 2006 06:54:03 -0000 1.4 *************** *** 523,526 **** --- 523,527 ---- } + void roadmap_main_set_cursor (int cursor) {} int main (int argc, char **argv) { |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:52:23
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31819 Modified Files: roadmap_main.cpp Log Message: Support cursor control. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** roadmap_main.cpp 3 Sep 2006 18:19:15 -0000 1.17 --- roadmap_main.cpp 4 Sep 2006 06:52:18 -0000 1.18 *************** *** 1316,1320 **** SendMessage(RoadMapMainWindow, WM_CLOSE, 0, 0); } ! } // extern "C" --- 1316,1333 ---- SendMessage(RoadMapMainWindow, WM_CLOSE, 0, 0); } ! ! void roadmap_main_set_cursor (int cursor) ! { ! switch (cursor) { ! ! case ROADMAP_CURSOR_NORMAL: ! SetCursor(NULL); ! break; ! ! case ROADMAP_CURSOR_WAIT: ! SetCursor(LoadCursor(NULL, IDC_WAIT)); ! break; ! } ! } } // extern "C" |
|
From: Ehud S. <esh...@us...> - 2006-09-04 06:51:47
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31434 Modified Files: navigate_main.c Log Message: Show WAIT cursor when calculating route. Index: navigate_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** navigate_main.c 3 Sep 2006 18:15:40 -0000 1.14 --- navigate_main.c 4 Sep 2006 06:51:42 -0000 1.15 *************** *** 54,57 **** --- 54,58 ---- #include "roadmap_address.h" #include "roadmap_sound.h" + #include "roadmap_main.h" //FIXME remove when navigation will support plugin lines *************** *** 284,287 **** --- 285,290 ---- } + roadmap_main_set_cursor (ROADMAP_CURSOR_WAIT); + track_time = navigate_get_route_segments *************** *** 289,292 **** --- 292,297 ---- NavigateSegments, &NavigateNumSegments, &result_flags); + roadmap_main_set_cursor (ROADMAP_CURSOR_NORMAL); + if (track_time <= 0) { return -1; *************** *** 712,715 **** --- 717,722 ---- } + roadmap_main_set_cursor (ROADMAP_CURSOR_WAIT); + track_time = navigate_get_route_segments *************** *** 717,720 **** --- 724,729 ---- NavigateSegments, &NavigateNumSegments, &result_flags); + roadmap_main_set_cursor (ROADMAP_CURSOR_NORMAL); + if (track_time <= 0) { NavigateTrackEnabled = 0; |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:59:19
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19122 Modified Files: roadmap_label.c Log Message: Merge Paul's changes. Index: roadmap_label.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_label.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_label.c 11 Aug 2006 18:12:20 -0000 1.6 --- roadmap_label.c 3 Sep 2006 18:59:16 -0000 1.7 *************** *** 29,37 **** * the cache clean, but that may not be enough if we get many labels. * ! * - New lables consume space from the label cache. It would be better if * we could scan the old labels list when a label is added and just * update its age. This will save us labels cache entries. It may * require the usage of a hash table for doing the scan efficiently. * * SYNOPSYS: * --- 29,44 ---- * the cache clean, but that may not be enough if we get many labels. * ! * - New labels consume space from the label cache. It would be better if * we could scan the old labels list when a label is added and just * update its age. This will save us labels cache entries. It may * require the usage of a hash table for doing the scan efficiently. * + * - Currently we keep in the cache labels and lines whose labels + * were not drawn, just in case they can be drawn next time. These + * also consume space, though it's not wasted. If we've hit the + * "cache full" condition, we should consider splicing the "undrawn" + * list onto the "spares" list rather than onto the cache, to free + * up cache entries. + * * SYNOPSYS: * *************** *** 55,58 **** --- 62,66 ---- #define POLY_OUTLINE 0 + #define LABEL_USING_LINEID 0 #define MIN(a, b) (a) < (b) ? (a) : (b) *************** *** 67,70 **** --- 75,79 ---- /* this is fairly arbitrary */ #define MAX_LABELS 2048 + #define ROADMAP_LABEL_STREETLABEL_SIZE 16 typedef struct { *************** *** 86,90 **** short gen; /* combination "drawn" flag and generation marker */ ! unsigned char invalid; } roadmap_label; --- 95,99 ---- short gen; /* combination "drawn" flag and generation marker */ ! unsigned char notext; } roadmap_label; *************** *** 203,210 **** roadmap_math_rotate_point (&poly[3], p, angle); - #if POLY_OUTLINE - { int lines = 4; roadmap_canvas_draw_multiple_lines(1, &lines, poly, 1); } - #endif - compute_bbox(poly, &c->bbox); --- 212,215 ---- *************** *** 225,228 **** --- 230,277 ---- } + void roadmap_label_text_extents(const char *text, int size, + int *width, int *ascent, int *descent, + int *can_tilt, int *easy_reading) + { + #ifdef ROADMAP_USE_LINEFONT + + roadmap_linefont_extents + (text, ROADMAP_LABEL_STREETLABEL_SIZE, width, ascent, descent); + + /* The linefont font isn't pretty. Reading it is hard with + * a road running through it, so we don't center labels on + * the road. + */ + *easy_reading = 0; + if (can_tilt) *can_tilt = 1; + + #else + + roadmap_canvas_get_text_extents + (text, -1, width, ascent, descent, can_tilt); + + *easy_reading = 1; + + #endif + } + + void roadmap_label_draw_text(const char *text, + RoadMapGuiPoint *start, RoadMapGuiPoint *center, + int doing_angles, int angle, int size) + { + + #ifdef ROADMAP_USE_LINEFONT + roadmap_linefont_text + (text, doing_angles ? ROADMAP_CANVAS_CENTER_BOTTOM : + ROADMAP_CANVAS_CENTER, center, size, angle); + #else + if (doing_angles) { + roadmap_canvas_draw_string_angle (start, center, angle, text); + } else { + roadmap_canvas_draw_string (center, ROADMAP_CANVAS_CENTER, text); + } + #endif + } + /* called when a screen repaint is complete. keeping track of * label "generations" involves keeping track of full refreshes, *************** *** 274,278 **** } ! cPtr->invalid = 0; cPtr->text = NULL; --- 323,327 ---- } ! cPtr->notext = 0; cPtr->text = NULL; *************** *** 291,296 **** /* the "generation" of a label is refreshed when it is re-added. ! * later, labels cache entries more than a generation old will ! * be discarded. */ cPtr->gen = RoadMapLabelGeneration; --- 340,344 ---- /* the "generation" of a label is refreshed when it is re-added. ! * later, labels cache entries can be aged, and discarded. */ cPtr->gen = RoadMapLabelGeneration; *************** *** 308,312 **** RoadMapListItem *item2, *tmp2; RoadMapListItem *end; ! RoadMapList unused_labels; int width, ascent, descent; RoadMapGuiRect r; --- 356,360 ---- RoadMapListItem *item2, *tmp2; RoadMapListItem *end; ! RoadMapList undrawn_labels; int width, ascent, descent; RoadMapGuiRect r; *************** *** 318,323 **** #define NEWLIST 1 int label_center_y; ! ROADMAP_LIST_INIT(&unused_labels); roadmap_canvas_select_pen (RoadMapLabelPen); --- 366,372 ---- #define NEWLIST 1 int label_center_y; + int cannot_label; ! ROADMAP_LIST_INIT(&undrawn_labels); roadmap_canvas_select_pen (RoadMapLabelPen); *************** *** 357,361 **** /* Found a new version of this existing line */ ! if (cPtr->invalid) { cPtr->gen = ncPtr->gen; --- 406,410 ---- /* Found a new version of this existing line */ ! if (cPtr->notext) { cPtr->gen = ncPtr->gen; *************** *** 408,414 **** } ! if ((cPtr->gen != RoadMapLabelGeneration) || cPtr->invalid) { ! roadmap_list_insert ! (&unused_labels, roadmap_list_remove(&cPtr->link)); continue; } --- 457,463 ---- } ! if ((cPtr->gen != RoadMapLabelGeneration) || cPtr->notext) { ! roadmap_list_append ! (&undrawn_labels, roadmap_list_remove(&cPtr->link)); continue; } *************** *** 421,425 **** --- 470,480 ---- cPtr->text = ""; } else { + #if LABEL_USING_LINEID + char buf[40]; + sprintf(buf, "%d", cPtr->line.line_id); + cPtr->text = strdup(buf); + #else cPtr->text = strdup(properties.street); + #endif } cPtr->street = properties.plugin_street; *************** *** 427,437 **** if (!*cPtr->text) { ! cPtr->invalid = 1; ! /* We keep the invalid lines in the cache to avoid repeating * all these tests just to find that it's invalid, again! */ roadmap_list_append ! (&unused_labels, roadmap_list_remove(&cPtr->link)); continue; } --- 482,492 ---- if (!*cPtr->text) { ! cPtr->notext = 1; ! /* We keep the no-label lines in the cache to avoid repeating * all these tests just to find that it's invalid, again! */ roadmap_list_append ! (&undrawn_labels, roadmap_list_remove(&cPtr->link)); continue; } *************** *** 439,471 **** if (cPtr->bbox.minx > cPtr->bbox.maxx) { ! ! #ifdef ROADMAP_USE_LINEFONT ! ! roadmap_linefont_extents(cPtr->text, 16, &width, &ascent, &descent); ! ! /* The linefont font isn't pretty. Reading it is hard with ! * a road running through it, so we don't center labels on ! * the road. */ ! label_center_y = 0; ! ! #else ! int i; ! ! roadmap_canvas_get_text_extents ! (cPtr->text, -1, &width, &ascent, &descent, &i); ! ! angles = angles && i; ! ! label_center_y = 1; ! #endif /* text is too long for this feature */ ! /* (4 times longer than feature) */ if ((width * width / 16) > cPtr->featuresize_sq) { /* Keep this one in the cache as the feature size may change ! * in the next run. */ roadmap_list_append ! (&unused_labels, roadmap_list_remove(&cPtr->link)); continue; } --- 494,512 ---- if (cPtr->bbox.minx > cPtr->bbox.maxx) { ! int can_tilt; ! roadmap_label_text_extents ! (cPtr->text, ROADMAP_LABEL_STREETLABEL_SIZE , ! &width, &ascent, &descent, &can_tilt, &label_center_y); ! angles = angles && can_tilt; /* text is too long for this feature */ ! /* (4 times longer than feature) */ if ((width * width / 16) > cPtr->featuresize_sq) { /* Keep this one in the cache as the feature size may change ! * in the next run. Keeping it is cheaper than looking it ! * up again. */ roadmap_list_append ! (&undrawn_labels, roadmap_list_remove(&cPtr->link)); continue; } *************** *** 495,500 **** } } #if POLY_OUTLINE ! else { int lines = 4; roadmap_canvas_draw_multiple_lines(1, &lines, cPtr->poly, 1); --- 536,542 ---- } } + #if POLY_OUTLINE ! { int lines = 4; roadmap_canvas_draw_multiple_lines(1, &lines, cPtr->poly, 1); *************** *** 512,520 **** midpt.y > roadmap_canvas_height()) { ! /* Keep this one in the cache as the feature size may change ! * in the next run. */ roadmap_list_append ! (&unused_labels, roadmap_list_remove(&cPtr->link)); continue; } --- 554,563 ---- midpt.y > roadmap_canvas_height()) { ! /* Keep this one in the cache -- it may move further on-screen ! * in the next run. Keeping it is cheaper than looking it ! * up again. */ roadmap_list_append ! (&undrawn_labels, roadmap_list_remove(&cPtr->link)); continue; } *************** *** 527,530 **** --- 570,575 ---- end = item; + cannot_label = 0; + ROADMAP_LIST_FOR_EACH_FROM_TO ( RoadMapLabelCache.list_first, end, item2, tmp2) { *************** *** 538,542 **** /* street already labelled */ if(roadmap_plugin_same_street(&cPtr->street, &ocPtr->street)) { ! cPtr->gen = 0; /* label is a duplicate */ break; } --- 583,587 ---- /* street already labelled */ if(roadmap_plugin_same_street(&cPtr->street, &ocPtr->street)) { ! cannot_label++; /* label is a duplicate */ break; } *************** *** 548,552 **** /* if labels are horizontal, bbox check is sufficient */ if(!angles) { ! cPtr->gen = 0; break; } --- 593,597 ---- /* if labels are horizontal, bbox check is sufficient */ if(!angles) { ! cannot_label++; break; } *************** *** 558,562 **** aang = abs(cPtr->angle); if (aang < 4 || aang > 86) { ! cPtr->gen = 0; break; } --- 603,607 ---- aang = abs(cPtr->angle); if (aang < 4 || aang > 86) { ! cannot_label++; break; } *************** *** 564,568 **** aang = abs(ocPtr->angle); if (aang < 4 || aang > 86) { ! cPtr->gen = 0; break; } --- 609,613 ---- aang = abs(ocPtr->angle); if (aang < 4 || aang > 86) { ! cannot_label++; break; } *************** *** 570,574 **** /* otherwise we do the full poly check */ if (poly_overlap (ocPtr, cPtr)) { ! cPtr->gen = 0; break; } --- 615,619 ---- /* otherwise we do the full poly check */ if (poly_overlap (ocPtr, cPtr)) { ! cannot_label++; break; } *************** *** 576,603 **** } ! if(cPtr->gen == 0) { /* Keep this one in the cache as we may need it for the next ! * run. */ - cPtr->gen = RoadMapLabelGeneration; roadmap_list_append ! (&unused_labels, roadmap_list_remove(&cPtr->link)); continue; /* next label */ } ! #ifdef ROADMAP_USE_LINEFONT ! roadmap_linefont_text (cPtr->text, ! angles ? ROADMAP_LINEFONT_CENTERED_ABOVE : ROADMAP_LINEFONT_CENTERED, ! &cPtr->center_point, 16, cPtr->angle); ! #else ! if (angles) { ! roadmap_canvas_draw_string_angle ! (&cPtr->text_point, &cPtr->center_point, cPtr->angle, ! cPtr->text); ! } else { ! roadmap_canvas_draw_string ! (&cPtr->center_point, ROADMAP_CANVAS_CENTER, cPtr->text); ! } ! #endif if (whichlist == NEWLIST) { /* move the rendered label to the cache */ --- 621,638 ---- } ! if(cannot_label) { /* Keep this one in the cache as we may need it for the next ! * run. Keeping it is cheaper than looking it up again. */ roadmap_list_append ! (&undrawn_labels, roadmap_list_remove(&cPtr->link)); continue; /* next label */ } ! roadmap_label_draw_text ! (cPtr->text, &cPtr->text_point, &cPtr->center_point, ! angles, angles ? cPtr->angle : 0, ! ROADMAP_LABEL_STREETLABEL_SIZE ); ! if (whichlist == NEWLIST) { /* move the rendered label to the cache */ *************** *** 609,613 **** } /* next list */ ! ROADMAP_LIST_SPLICE (&RoadMapLabelCache, &unused_labels); RoadMapLabelGeneration++; return 0; --- 644,648 ---- } /* next list */ ! ROADMAP_LIST_SPLICE (&RoadMapLabelCache, &undrawn_labels); RoadMapLabelGeneration++; return 0; *************** *** 616,624 **** int roadmap_label_activate (void) { RoadMapLabelPen = roadmap_canvas_create_pen ("labels.main"); roadmap_canvas_set_foreground (roadmap_config_get (&RoadMapConfigLabelsColor)); - /* assume this will only affect our internal line fonts */ roadmap_canvas_set_thickness (2); --- 651,659 ---- int roadmap_label_activate (void) { + RoadMapLabelPen = roadmap_canvas_create_pen ("labels.main"); roadmap_canvas_set_foreground (roadmap_config_get (&RoadMapConfigLabelsColor)); roadmap_canvas_set_thickness (2); *************** *** 626,630 **** RoadMapLabelMinFeatSizeSq *= RoadMapLabelMinFeatSizeSq; - return 0; } --- 661,664 ---- *************** *** 638,641 **** --- 672,676 ---- roadmap_config_declare ("preferences", &RoadMapConfigLabelsColor, "#000000"); + ROADMAP_LIST_INIT(&RoadMapLabelCache); |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:46
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libguiroadmap Modified Files: libguiroadmap.vcp Log Message: Update evc environment. Index: libguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** libguiroadmap.vcp 16 Jul 2006 12:30:55 -0000 1.5 --- libguiroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.6 *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 370,373 **** --- 370,374 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 407,410 **** --- 408,412 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 609,612 **** --- 611,615 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 644,647 **** --- 647,651 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 932,935 **** --- 936,940 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 967,970 **** --- 972,976 ---- "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 1314,1317 **** --- 1320,1324 ---- "..\..\..\roadmap_hash.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 1350,1353 **** --- 1357,1361 ---- "..\..\..\roadmap_hash.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 1502,1505 **** --- 1510,1514 ---- "..\..\..\roadmap_help.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 1524,1527 **** --- 1533,1537 ---- "..\..\..\roadmap_help.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 1930,1933 **** --- 1940,1944 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_plugin.h"\ *************** *** 1936,1939 **** --- 1947,1953 ---- "..\..\roadmap_win32.h"\ + NODEP_CPP_ROADMAP_L=\ + "..\..\..\roadmap_linefont.h"\ + !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release" *************** *** 1945,1948 **** --- 1959,1963 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_plugin.h"\ *************** *** 1951,1954 **** --- 1966,1972 ---- "..\..\roadmap_win32.h"\ + NODEP_CPP_ROADMAP_L=\ + "..\..\..\roadmap_linefont.h"\ + !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler" *************** *** 2203,2206 **** --- 2221,2225 ---- DEP_CPP_ROADMAP_N=\ + "..\..\..\editor\editor_plugin.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_adjust.h"\ *************** *** 2240,2243 **** --- 2259,2263 ---- DEP_CPP_ROADMAP_N=\ + "..\..\..\editor\editor_plugin.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_adjust.h"\ *************** *** 2622,2625 **** --- 2642,2646 ---- "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_preferences.h"\ "..\..\..\roadmap_types.h"\ *************** *** 2634,2637 **** --- 2655,2659 ---- "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_preferences.h"\ "..\..\..\roadmap_types.h"\ *************** *** 2814,2817 **** --- 2836,2840 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_layer.h"\ "..\..\..\roadmap_line.h"\ *************** *** 2859,2862 **** --- 2882,2886 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_layer.h"\ "..\..\..\roadmap_line.h"\ *************** *** 3381,3384 **** --- 3405,3411 ---- "..\..\..\editor\export\editor_sync.h"\ "..\..\..\editor\export\editor_upload.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\editor\static\update_range.h"\ "..\..\..\navigate\navigate_main.h"\ "..\..\..\roadmap.h"\ *************** *** 3407,3410 **** --- 3434,3438 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 3422,3427 **** --- 3450,3457 ---- "..\..\..\roadmap_screen_obj.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_sprite.h"\ + "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_string.h"\ *************** *** 3442,3445 **** --- 3472,3478 ---- "..\..\..\editor\export\editor_sync.h"\ "..\..\..\editor\export\editor_upload.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\editor\static\update_range.h"\ "..\..\..\navigate\navigate_main.h"\ "..\..\..\roadmap.h"\ *************** *** 3468,3471 **** --- 3501,3505 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_label.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ *************** *** 3483,3488 **** --- 3517,3524 ---- "..\..\..\roadmap_screen_obj.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_sprite.h"\ + "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_street.h"\ "..\..\..\roadmap_string.h"\ *************** *** 3699,3702 **** --- 3735,3739 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_math.h"\ *************** *** 3734,3737 **** --- 3771,3775 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_math.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:44
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/setupdll Modified Files: setupdll.cpp setupdll.vcp Log Message: Update evc environment. Index: setupdll.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll/setupdll.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setupdll.cpp 18 Aug 2006 18:10:13 -0000 1.1 --- setupdll.cpp 3 Sep 2006 18:20:35 -0000 1.2 *************** *** 29,33 **** WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); ! wcscat(roadmap_exe, L"\\Roadmap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); --- 29,33 ---- WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); ! wcscat(roadmap_exe, L"\\FreeMap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); *************** *** 65,69 **** WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); ! wcscat(roadmap_exe, L"\\Roadmap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); --- 65,69 ---- WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); ! wcscat(roadmap_exe, L"\\FreeMap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); *************** *** 103,105 **** } - --- 103,104 ---- Index: setupdll.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll/setupdll.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setupdll.vcp 18 Aug 2006 18:10:13 -0000 1.1 --- setupdll.vcp 3 Sep 2006 18:20:35 -0000 1.2 *************** *** 49,54 **** # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 49,54 ---- # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "setupdll - Win32 (WCE ARMV4) Debug" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "setupdll - Win32 (WCE ARMV4) Debug" *************** *** 79,84 **** # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /M$(CECrtMTDebug) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 --- 79,84 ---- # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /M$(CECrtMTDebug) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 88,93 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF --- 88,93 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF *************** *** 105,110 **** DEP_CPP_SETUP=\ ".\setupdll.h"\ ! {$(INCLUDE)}"ce_setup.h"\ ! {$(INCLUDE)}"notify.h"\ # End Source File --- 105,112 ---- DEP_CPP_SETUP=\ ".\setupdll.h"\ ! ! NODEP_CPP_SETUP=\ ! ".\e_setup.h"\ ! ".\otify.h"\ # End Source File |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:42
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libwinceguiroadmap Modified Files: libwinceguiroadmap.vcp Log Message: Update evc environment. Index: libwinceguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** libwinceguiroadmap.vcp 12 May 2006 14:23:39 -0000 1.6 --- libwinceguiroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.7 *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "../../../agg/font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /I "../../../agg/font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 242,280 **** DEP_CPP_ROADM=\ - "..\..\..\agg23\include\agg_array.h"\ - "..\..\..\agg23\include\agg_basics.h"\ - "..\..\..\agg23\include\agg_clip_liang_barsky.h"\ - "..\..\..\agg23\include\agg_color_rgba.h"\ - "..\..\..\agg23\include\agg_config.h"\ - "..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\ - "..\..\..\agg23\include\agg_conv_contour.h"\ - "..\..\..\agg23\include\agg_conv_stroke.h"\ - "..\..\..\agg23\include\agg_conv_transform.h"\ - "..\..\..\agg23\include\agg_curves.h"\ - "..\..\..\agg23\include\agg_dda_line.h"\ - "..\..\..\agg23\include\agg_ellipse.h"\ - "..\..\..\agg23\include\agg_ellipse_bresenham.h"\ - "..\..\..\agg23\include\agg_gamma_functions.h"\ - "..\..\..\agg23\include\agg_line_aa_basics.h"\ - "..\..\..\agg23\include\agg_math.h"\ - "..\..\..\agg23\include\agg_math_stroke.h"\ - "..\..\..\agg23\include\agg_path_storage.h"\ - "..\..\..\agg23\include\agg_pixfmt_rgb.h"\ - "..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\ - "..\..\..\agg23\include\agg_rasterizer_outline.h"\ - "..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\ - "..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\ - "..\..\..\agg23\include\agg_render_scanlines.h"\ - "..\..\..\agg23\include\agg_renderer_base.h"\ - "..\..\..\agg23\include\agg_renderer_outline_aa.h"\ - "..\..\..\agg23\include\agg_renderer_primitives.h"\ - "..\..\..\agg23\include\agg_renderer_scanline.h"\ - "..\..\..\agg23\include\agg_rendering_buffer.h"\ - "..\..\..\agg23\include\agg_scanline_p.h"\ - "..\..\..\agg23\include\agg_trans_affine.h"\ - "..\..\..\agg23\include\agg_vcgen_contour.h"\ - "..\..\..\agg23\include\agg_vcgen_stroke.h"\ - "..\..\..\agg23\include\agg_vertex_sequence.h"\ - "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ --- 242,245 ---- *************** *** 292,300 **** "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ ! # ADD CPP /I "../../../agg/include" ! ! !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug" ! ! DEP_CPP_ROADM=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ --- 257,261 ---- "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ ! NODEP_CPP_ROADM=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ *************** *** 332,335 **** --- 293,302 ---- "..\..\..\agg23\include\agg_vertex_sequence.h"\ "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ + + # ADD CPP /I "../../../agg/include" + + !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug" + + DEP_CPP_ROADM=\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 347,355 **** "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ ! # ADD CPP /I "../../../agg/include" ! ! !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug" ! ! DEP_CPP_ROADM=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ --- 314,318 ---- "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ ! NODEP_CPP_ROADM=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ *************** *** 370,375 **** "..\..\..\agg23\include\agg_math_stroke.h"\ "..\..\..\agg23\include\agg_path_storage.h"\ "..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\ - "..\..\..\agg23\include\agg_pixfmt_rgba.h"\ "..\..\..\agg23\include\agg_rasterizer_outline.h"\ "..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\ --- 333,338 ---- "..\..\..\agg23\include\agg_math_stroke.h"\ "..\..\..\agg23\include\agg_path_storage.h"\ + "..\..\..\agg23\include\agg_pixfmt_rgb.h"\ "..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\ "..\..\..\agg23\include\agg_rasterizer_outline.h"\ "..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\ *************** *** 387,392 **** "..\..\..\agg23\include\agg_vertex_sequence.h"\ "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ ! "..\..\..\agg23\include\util\agg_color_conv.h"\ ! "..\..\..\agg23\include\util\agg_color_conv_rgb8.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ --- 350,398 ---- "..\..\..\agg23\include\agg_vertex_sequence.h"\ "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ ! ! # ADD CPP /I "../../../agg/include" ! ! !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug" ! ! DEP_CPP_ROADM=\ ! "..\..\..\agg\include\agg_array.h"\ ! "..\..\..\agg\include\agg_basics.h"\ ! "..\..\..\agg\include\agg_bezier_arc.h"\ ! "..\..\..\agg\include\agg_clip_liang_barsky.h"\ ! "..\..\..\agg\include\agg_color_rgba.h"\ ! "..\..\..\agg\include\agg_config.h"\ ! "..\..\..\agg\include\agg_conv_adaptor_vcgen.h"\ ! "..\..\..\agg\include\agg_conv_contour.h"\ ! "..\..\..\agg\include\agg_conv_stroke.h"\ ! "..\..\..\agg\include\agg_conv_transform.h"\ ! "..\..\..\agg\include\agg_curves.h"\ ! "..\..\..\agg\include\agg_dda_line.h"\ ! "..\..\..\agg\include\agg_ellipse.h"\ ! "..\..\..\agg\include\agg_ellipse_bresenham.h"\ ! "..\..\..\agg\include\agg_gamma_functions.h"\ ! "..\..\..\agg\include\agg_line_aa_basics.h"\ ! "..\..\..\agg\include\agg_math.h"\ ! "..\..\..\agg\include\agg_math_stroke.h"\ ! "..\..\..\agg\include\agg_path_storage.h"\ ! "..\..\..\agg\include\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg\include\agg_pixfmt_rgba.h"\ ! "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_outline.h"\ ! "..\..\..\agg\include\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ ! "..\..\..\agg\include\agg_renderer_base.h"\ ! "..\..\..\agg\include\agg_renderer_outline_aa.h"\ ! "..\..\..\agg\include\agg_renderer_primitives.h"\ ! "..\..\..\agg\include\agg_renderer_scanline.h"\ ! "..\..\..\agg\include\agg_rendering_buffer.h"\ ! "..\..\..\agg\include\agg_scanline_p.h"\ ! "..\..\..\agg\include\agg_trans_affine.h"\ ! "..\..\..\agg\include\agg_vcgen_contour.h"\ ! "..\..\..\agg\include\agg_vcgen_stroke.h"\ ! "..\..\..\agg\include\agg_vertex_sequence.h"\ ! "..\..\..\agg\include\platform\win32\agg_win32_bmp.h"\ ! "..\..\..\agg\include\util\agg_color_conv.h"\ ! "..\..\..\agg\include\util\agg_color_conv_rgb8.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 404,407 **** --- 410,416 ---- "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + NODEP_CPP_ROADM=\ + "..\..\..\agg\include\agg_allocator.h"\ + # ADD CPP /I "../../../agg/include" *************** *** 409,449 **** DEP_CPP_ROADM=\ ! "..\..\..\agg23\include\agg_array.h"\ ! "..\..\..\agg23\include\agg_basics.h"\ ! "..\..\..\agg23\include\agg_clip_liang_barsky.h"\ ! "..\..\..\agg23\include\agg_color_rgba.h"\ ! "..\..\..\agg23\include\agg_config.h"\ ! "..\..\..\agg23\include\agg_conv_adaptor_vcgen.h"\ ! "..\..\..\agg23\include\agg_conv_contour.h"\ ! "..\..\..\agg23\include\agg_conv_stroke.h"\ ! "..\..\..\agg23\include\agg_conv_transform.h"\ ! "..\..\..\agg23\include\agg_curves.h"\ ! "..\..\..\agg23\include\agg_dda_line.h"\ ! "..\..\..\agg23\include\agg_ellipse.h"\ ! "..\..\..\agg23\include\agg_ellipse_bresenham.h"\ ! "..\..\..\agg23\include\agg_gamma_functions.h"\ ! "..\..\..\agg23\include\agg_line_aa_basics.h"\ ! "..\..\..\agg23\include\agg_math.h"\ ! "..\..\..\agg23\include\agg_math_stroke.h"\ ! "..\..\..\agg23\include\agg_path_storage.h"\ ! "..\..\..\agg23\include\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg23\include\agg_pixfmt_rgba.h"\ ! "..\..\..\agg23\include\agg_rasterizer_outline.h"\ ! "..\..\..\agg23\include\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg23\include\agg_render_scanlines.h"\ ! "..\..\..\agg23\include\agg_renderer_base.h"\ ! "..\..\..\agg23\include\agg_renderer_outline_aa.h"\ ! "..\..\..\agg23\include\agg_renderer_primitives.h"\ ! "..\..\..\agg23\include\agg_renderer_scanline.h"\ ! "..\..\..\agg23\include\agg_rendering_buffer.h"\ ! "..\..\..\agg23\include\agg_scanline_p.h"\ ! "..\..\..\agg23\include\agg_trans_affine.h"\ ! "..\..\..\agg23\include\agg_vcgen_contour.h"\ ! "..\..\..\agg23\include\agg_vcgen_stroke.h"\ ! "..\..\..\agg23\include\agg_vertex_sequence.h"\ ! "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ ! "..\..\..\agg23\include\util\agg_color_conv.h"\ ! "..\..\..\agg23\include\util\agg_color_conv_rgb8.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ --- 418,460 ---- DEP_CPP_ROADM=\ ! "..\..\..\agg\include\agg_array.h"\ ! "..\..\..\agg\include\agg_basics.h"\ ! "..\..\..\agg\include\agg_bezier_arc.h"\ ! "..\..\..\agg\include\agg_clip_liang_barsky.h"\ ! "..\..\..\agg\include\agg_color_rgba.h"\ ! "..\..\..\agg\include\agg_config.h"\ ! "..\..\..\agg\include\agg_conv_adaptor_vcgen.h"\ ! "..\..\..\agg\include\agg_conv_contour.h"\ ! "..\..\..\agg\include\agg_conv_stroke.h"\ ! "..\..\..\agg\include\agg_conv_transform.h"\ ! "..\..\..\agg\include\agg_curves.h"\ ! "..\..\..\agg\include\agg_dda_line.h"\ ! "..\..\..\agg\include\agg_ellipse.h"\ ! "..\..\..\agg\include\agg_ellipse_bresenham.h"\ ! "..\..\..\agg\include\agg_gamma_functions.h"\ ! "..\..\..\agg\include\agg_line_aa_basics.h"\ ! "..\..\..\agg\include\agg_math.h"\ ! "..\..\..\agg\include\agg_math_stroke.h"\ ! "..\..\..\agg\include\agg_path_storage.h"\ ! "..\..\..\agg\include\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg\include\agg_pixfmt_rgba.h"\ ! "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_outline.h"\ ! "..\..\..\agg\include\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ ! "..\..\..\agg\include\agg_renderer_base.h"\ ! "..\..\..\agg\include\agg_renderer_outline_aa.h"\ ! "..\..\..\agg\include\agg_renderer_primitives.h"\ ! "..\..\..\agg\include\agg_renderer_scanline.h"\ ! "..\..\..\agg\include\agg_rendering_buffer.h"\ ! "..\..\..\agg\include\agg_scanline_p.h"\ ! "..\..\..\agg\include\agg_trans_affine.h"\ ! "..\..\..\agg\include\agg_vcgen_contour.h"\ ! "..\..\..\agg\include\agg_vcgen_stroke.h"\ ! "..\..\..\agg\include\agg_vertex_sequence.h"\ ! "..\..\..\agg\include\platform\win32\agg_win32_bmp.h"\ ! "..\..\..\agg\include\util\agg_color_conv.h"\ ! "..\..\..\agg\include\util\agg_color_conv_rgb8.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 461,464 **** --- 472,478 ---- "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + NODEP_CPP_ROADM=\ + "..\..\..\agg\include\agg_allocator.h"\ + # ADD CPP /I "../../../agg/include" *************** *** 466,469 **** --- 480,499 ---- DEP_CPP_ROADM=\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_canvas_agg.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_math.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\colors.h"\ + "..\..\roadmap_win32.h"\ + "..\..\roadmap_wincecanvas.h"\ + "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + + NODEP_CPP_ROADM=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ *************** *** 501,518 **** "..\..\..\agg23\include\agg_vertex_sequence.h"\ "..\..\..\agg23\include\platform\win32\agg_win32_bmp.h"\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_canvas.h"\ - "..\..\..\roadmap_canvas_agg.h"\ - "..\..\..\roadmap_config.h"\ - "..\..\..\roadmap_gui.h"\ - "..\..\..\roadmap_math.h"\ - "..\..\..\roadmap_messagebox.h"\ - "..\..\..\roadmap_path.h"\ - "..\..\..\roadmap_screen.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\colors.h"\ - "..\..\roadmap_win32.h"\ - "..\..\roadmap_wincecanvas.h"\ - "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ # ADD CPP /I "../../../agg/include" --- 531,534 ---- *************** *** 577,580 **** --- 593,597 ---- DEP_CPP_ROADMA=\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_factory.h"\ *************** *** 582,585 **** --- 599,603 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 603,606 **** --- 621,625 ---- DEP_CPP_ROADMA=\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_factory.h"\ *************** *** 608,611 **** --- 627,631 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 773,776 **** --- 793,797 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 793,796 **** --- 814,818 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:39
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libguiroadgps Modified Files: libguiroadgps.vcp Log Message: Update evc environment. Index: libguiroadgps.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps/libguiroadgps.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libguiroadgps.vcp 23 Apr 2006 13:32:25 -0000 1.3 --- libguiroadgps.vcp 3 Sep 2006 18:20:35 -0000 1.4 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c - # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libguiroadgps - Win32 (WCE x86) Release" *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 312,316 **** --- 312,318 ---- "..\..\..\roadgps_logger.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fileselection.h"\ "..\..\..\roadmap_gps.h"\ "..\..\..\roadmap_gui.h"\ *************** *** 319,326 **** --- 321,330 ---- "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 330,334 **** --- 334,340 ---- "..\..\..\roadgps_logger.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_config.h"\ "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fileselection.h"\ "..\..\..\roadmap_gps.h"\ "..\..\..\roadmap_gui.h"\ *************** *** 337,344 **** --- 343,352 ---- "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 469,478 **** "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_nmea.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ - "..\..\..\roadmap_string.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ --- 477,485 ---- "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 490,499 **** "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_net.h"\ - "..\..\..\roadmap_nmea.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ - "..\..\..\roadmap_string.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ --- 497,505 ---- "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 638,641 **** --- 644,648 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 661,664 **** --- 668,672 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 788,791 **** --- 796,800 ---- "..\..\..\roadmap_help.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 797,800 **** --- 806,810 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 809,812 **** --- 819,823 ---- "..\..\..\roadmap_help.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ *************** *** 818,821 **** --- 829,833 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:39
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/rdmghost Modified Files: rdmghost.vcp Log Message: Update evc environment. Index: rdmghost.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost/rdmghost.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rdmghost.vcp 23 Apr 2006 13:32:25 -0000 1.2 --- rdmghost.vcp 3 Sep 2006 18:20:35 -0000 1.3 *************** *** 50,55 **** # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # SUBTRACT CPP /O<none> # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 50,54 ---- # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:39
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/agg Modified Files: agg.vcp Log Message: Update evc environment. Index: agg.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg/agg.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** agg.vcp 22 Jun 2006 18:50:49 -0000 1.2 --- agg.vcp 3 Sep 2006 18:20:35 -0000 1.3 *************** *** 47,51 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 47,51 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /I "../../../agg/include" /I "../../../freetype/include" /I "../../../fribidi" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "USE_FRIBIDI" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 118,123 **** SOURCE=..\..\..\agg\src\agg_bezier_arc.cpp NODEP_CPP_AGG_B=\ ! "..\..\..\agg\src\agg_bezier_arc.h"\ # End Source File --- 118,130 ---- SOURCE=..\..\..\agg\src\agg_bezier_arc.cpp + DEP_CPP_AGG_B=\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_bezier_arc.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_conv_transform.h"\ + "..\..\..\agg\include\agg_trans_affine.h"\ + NODEP_CPP_AGG_B=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 125,131 **** SOURCE=..\..\..\agg\src\agg_curves.cpp NODEP_CPP_AGG_C=\ ! "..\..\..\agg\src\agg_curves.h"\ ! "..\..\..\agg\src\agg_math.h"\ # End Source File --- 132,144 ---- SOURCE=..\..\..\agg\src\agg_curves.cpp + DEP_CPP_AGG_C=\ + "..\..\..\agg\include\agg_array.h"\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_curves.h"\ + "..\..\..\agg\include\agg_math.h"\ + NODEP_CPP_AGG_C=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 135,151 **** DEP_CPP_AGG_F=\ "..\..\..\agg\font_freetype\agg_font_freetype.h"\ NODEP_CPP_AGG_F=\ ! "..\..\..\agg\font_freetype\agg_bitset_iterator.h"\ ! "..\..\..\agg\font_freetype\agg_conv_curve.h"\ ! "..\..\..\agg\font_freetype\agg_font_cache_manager.h"\ ! "..\..\..\agg\font_freetype\agg_path_storage_integer.h"\ ! "..\..\..\agg\font_freetype\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\font_freetype\agg_renderer_scanline.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_aa.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_u.h"\ ! "..\..\..\agg\font_freetype\agg_trans_affine.h"\ # End Source File --- 148,178 ---- DEP_CPP_AGG_F=\ "..\..\..\agg\font_freetype\agg_font_freetype.h"\ + "..\..\..\agg\include\agg_array.h"\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_bitset_iterator.h"\ + "..\..\..\agg\include\agg_clip_liang_barsky.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_conv_curve.h"\ + "..\..\..\agg\include\agg_curves.h"\ + "..\..\..\agg\include\agg_font_cache_manager.h"\ + "..\..\..\agg\include\agg_gamma_functions.h"\ + "..\..\..\agg\include\agg_math.h"\ + "..\..\..\agg\include\agg_path_storage_integer.h"\ + "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ + "..\..\..\agg\include\agg_renderer_base.h"\ + "..\..\..\agg\include\agg_renderer_scanline.h"\ + "..\..\..\agg\include\agg_rendering_buffer.h"\ + "..\..\..\agg\include\agg_scanline_bin.h"\ + "..\..\..\agg\include\agg_scanline_storage_aa.h"\ + "..\..\..\agg\include\agg_scanline_storage_bin.h"\ + "..\..\..\agg\include\agg_scanline_u.h"\ + "..\..\..\agg\include\agg_trans_affine.h"\ + "..\..\..\freetype\include\freetype\config\ftheader.h"\ + "..\..\..\freetype\include\ft2build.h"\ NODEP_CPP_AGG_F=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 153,158 **** SOURCE=..\..\..\agg\src\agg_line_aa_basics.cpp NODEP_CPP_AGG_L=\ ! "..\..\..\agg\src\agg_line_aa_basics.h"\ # End Source File --- 180,190 ---- SOURCE=..\..\..\agg\src\agg_line_aa_basics.cpp + DEP_CPP_AGG_L=\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_line_aa_basics.h"\ + NODEP_CPP_AGG_L=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 160,165 **** SOURCE=..\..\..\agg\src\agg_line_profile_aa.cpp NODEP_CPP_AGG_LI=\ ! "..\..\..\agg\src\agg_renderer_outline_aa.h"\ # End Source File --- 192,211 ---- SOURCE=..\..\..\agg\src\agg_line_profile_aa.cpp + DEP_CPP_AGG_LI=\ + "..\..\..\agg\include\agg_array.h"\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_clip_liang_barsky.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_dda_line.h"\ + "..\..\..\agg\include\agg_ellipse_bresenham.h"\ + "..\..\..\agg\include\agg_gamma_functions.h"\ + "..\..\..\agg\include\agg_line_aa_basics.h"\ + "..\..\..\agg\include\agg_math.h"\ + "..\..\..\agg\include\agg_renderer_base.h"\ + "..\..\..\agg\include\agg_renderer_outline_aa.h"\ + "..\..\..\agg\include\agg_rendering_buffer.h"\ + NODEP_CPP_AGG_LI=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 167,172 **** SOURCE=..\..\..\agg\src\agg_sqrt_tables.cpp NODEP_CPP_AGG_S=\ ! "..\..\..\agg\src\agg_basics.h"\ # End Source File --- 213,222 ---- SOURCE=..\..\..\agg\src\agg_sqrt_tables.cpp + DEP_CPP_AGG_S=\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_config.h"\ + NODEP_CPP_AGG_S=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 174,179 **** SOURCE=..\..\..\agg\src\agg_trans_affine.cpp NODEP_CPP_AGG_T=\ ! "..\..\..\agg\src\agg_trans_affine.h"\ # End Source File --- 224,234 ---- SOURCE=..\..\..\agg\src\agg_trans_affine.cpp + DEP_CPP_AGG_T=\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_trans_affine.h"\ + NODEP_CPP_AGG_T=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 181,187 **** SOURCE=..\..\..\agg\src\platform\win32\agg_win32_bmp.cpp NODEP_CPP_AGG_W=\ ! "..\..\..\agg\src\platform\win32\agg_basics.h"\ ! "..\..\..\agg\src\platform\win32\platform\win32\agg_win32_bmp.h"\ # End Source File --- 236,246 ---- SOURCE=..\..\..\agg\src\platform\win32\agg_win32_bmp.cpp + DEP_CPP_AGG_W=\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\platform\win32\agg_win32_bmp.h"\ + NODEP_CPP_AGG_W=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File *************** *** 191,194 **** --- 250,312 ---- DEP_CPP_ROADM=\ "..\..\..\agg\font_freetype\agg_font_freetype.h"\ + "..\..\..\agg\include\agg_array.h"\ + "..\..\..\agg\include\agg_basics.h"\ + "..\..\..\agg\include\agg_bezier_arc.h"\ + "..\..\..\agg\include\agg_clip_liang_barsky.h"\ + "..\..\..\agg\include\agg_color_rgba.h"\ + "..\..\..\agg\include\agg_config.h"\ + "..\..\..\agg\include\agg_conv_adaptor_vcgen.h"\ + "..\..\..\agg\include\agg_conv_contour.h"\ + "..\..\..\agg\include\agg_conv_curve.h"\ + "..\..\..\agg\include\agg_conv_stroke.h"\ + "..\..\..\agg\include\agg_conv_transform.h"\ + "..\..\..\agg\include\agg_curves.h"\ + "..\..\..\agg\include\agg_dda_line.h"\ + "..\..\..\agg\include\agg_ellipse.h"\ + "..\..\..\agg\include\agg_ellipse_bresenham.h"\ + "..\..\..\agg\include\agg_font_cache_manager.h"\ + "..\..\..\agg\include\agg_gamma_functions.h"\ + "..\..\..\agg\include\agg_line_aa_basics.h"\ + "..\..\..\agg\include\agg_math.h"\ + "..\..\..\agg\include\agg_math_stroke.h"\ + "..\..\..\agg\include\agg_path_storage.h"\ + "..\..\..\agg\include\agg_path_storage_integer.h"\ + "..\..\..\agg\include\agg_pixfmt_rgb_packed.h"\ + "..\..\..\agg\include\agg_pixfmt_rgba.h"\ + "..\..\..\agg\include\agg_rasterizer_cells_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_outline.h"\ + "..\..\..\agg\include\agg_rasterizer_outline_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_scanline_aa.h"\ + "..\..\..\agg\include\agg_rasterizer_sl_clip.h"\ + "..\..\..\agg\include\agg_renderer_base.h"\ + "..\..\..\agg\include\agg_renderer_outline_aa.h"\ + "..\..\..\agg\include\agg_renderer_primitives.h"\ + "..\..\..\agg\include\agg_renderer_scanline.h"\ + "..\..\..\agg\include\agg_rendering_buffer.h"\ + "..\..\..\agg\include\agg_scanline_bin.h"\ + "..\..\..\agg\include\agg_scanline_p.h"\ + "..\..\..\agg\include\agg_scanline_storage_aa.h"\ + "..\..\..\agg\include\agg_scanline_storage_bin.h"\ + "..\..\..\agg\include\agg_scanline_u.h"\ + "..\..\..\agg\include\agg_trans_affine.h"\ + "..\..\..\agg\include\agg_vcgen_contour.h"\ + "..\..\..\agg\include\agg_vcgen_stroke.h"\ + "..\..\..\agg\include\agg_vertex_sequence.h"\ + "..\..\..\freetype\include\freetype\config\ftheader.h"\ + "..\..\..\freetype\include\ft2build.h"\ + "..\..\..\fribidi\fribidi.h"\ + "..\..\..\fribidi\fribidi_char_sets.h"\ + "..\..\..\fribidi\fribidi_char_sets.i"\ + "..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1255.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1256.h"\ + "..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\ + "..\..\..\fribidi\fribidi_char_sets_utf8.h"\ + "..\..\..\fribidi\fribidi_config.h"\ + "..\..\..\fribidi\fribidi_types.h"\ + "..\..\..\fribidi\fribidi_types.i"\ + "..\..\..\fribidi\fribidi_unicode.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 205,234 **** NODEP_CPP_ROADM=\ ! "..\..\..\agg\agg_conv_contour.h"\ ! "..\..\..\agg\agg_conv_stroke.h"\ ! "..\..\..\agg\agg_conv_transform.h"\ ! "..\..\..\agg\agg_curves.h"\ ! "..\..\..\agg\agg_ellipse.h"\ ! "..\..\..\agg\agg_path_storage.h"\ ! "..\..\..\agg\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg\agg_rasterizer_outline.h"\ ! "..\..\..\agg\agg_rasterizer_outline_aa.h"\ ! "..\..\..\agg\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\agg_renderer_outline_aa.h"\ ! "..\..\..\agg\agg_renderer_primitives.h"\ ! "..\..\..\agg\agg_renderer_scanline.h"\ ! "..\..\..\agg\agg_rendering_buffer.h"\ ! "..\..\..\agg\agg_scanline_p.h"\ ! "..\..\..\agg\font_freetype\agg_conv_curve.h"\ ! "..\..\..\agg\font_freetype\agg_font_cache_manager.h"\ ! "..\..\..\agg\font_freetype\agg_path_storage_integer.h"\ ! "..\..\..\agg\font_freetype\agg_rasterizer_scanline_aa.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_aa.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_storage_bin.h"\ ! "..\..\..\agg\font_freetype\agg_scanline_u.h"\ ! "..\..\..\agg\font_freetype\agg_trans_affine.h"\ ! "..\..\..\agg_pixfmt_rgb_packed.h"\ ! "..\..\..\agg_pixfmt_rgba.h"\ # End Source File --- 323,327 ---- NODEP_CPP_ROADM=\ ! "..\..\..\agg\include\agg_allocator.h"\ # End Source File |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:39
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libft Modified Files: libft.vcp Log Message: Update evc environment. Index: libft.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft/libft.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libft.vcp 22 Jun 2006 18:50:49 -0000 1.3 --- libft.vcp 3 Sep 2006 18:20:35 -0000 1.4 *************** *** 47,51 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "../../../freetype/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib --- 47,51 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /I "../../../freetype/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/fribidi Modified Files: fribidi.vcp Log Message: Update evc environment. Index: fribidi.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi/fribidi.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fribidi.vcp 22 Jun 2006 18:50:49 -0000 1.2 --- fribidi.vcp 3 Sep 2006 18:20:35 -0000 1.3 *************** *** 47,51 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "WIN32" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib --- 47,51 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "WIN32" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libroadmap Modified Files: libroadmap.vcp Log Message: Update evc environment. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** libroadmap.vcp 18 Aug 2006 18:10:41 -0000 1.17 --- libroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.18 *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /I "..\..\.." /I "..\..\..\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 486,489 **** --- 486,490 ---- "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_trip.h"\ *************** *** 1233,1236 **** --- 1234,1238 ---- "..\..\..\editor\db\editor_dictionary.h"\ "..\..\..\editor\db\editor_line.h"\ + "..\..\..\editor\db\editor_marker.h"\ "..\..\..\editor\db\editor_override.h"\ "..\..\..\editor\db\editor_point.h"\ *************** *** 1651,1654 **** --- 1653,1657 ---- "..\..\..\editor\export\editor_sync.h"\ "..\..\..\editor\export\editor_upload.h"\ + "..\..\..\editor\static\notes.h"\ "..\..\..\editor\static\update_range.h"\ "..\..\..\editor\track\editor_track_main.h"\ *************** *** 1768,1771 **** --- 1771,1775 ---- "..\..\..\roadmap_db.h"\ "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ *************** *** 4668,4671 **** --- 4672,4676 ---- "..\..\..\dglib\tree.h"\ "..\..\..\dglib\type.h"\ + "..\..\..\editor\editor_plugin.h"\ "..\..\..\navigate\navigate_bar.h"\ "..\..\..\navigate\navigate_graph.h"\ *************** *** 4674,4677 **** --- 4679,4683 ---- "..\..\..\navigate\navigate_plugin.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_address.h"\ "..\..\..\roadmap_adjust.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 4720,4723 **** --- 4726,4730 ---- "..\..\..\dglib\tree.h"\ "..\..\..\dglib\type.h"\ + "..\..\..\editor\editor_plugin.h"\ "..\..\..\navigate\navigate_bar.h"\ "..\..\..\navigate\navigate_graph.h"\ *************** *** 4726,4729 **** --- 4733,4737 ---- "..\..\..\navigate\navigate_plugin.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_address.h"\ "..\..\..\roadmap_adjust.h"\ "..\..\..\roadmap_canvas.h"\ *************** *** 4973,4976 **** --- 4981,4985 ---- "..\..\..\editor\static\notes.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_adjust.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ *************** *** 4978,4981 **** --- 4987,4991 ---- "..\..\..\roadmap_db.h"\ "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_dictionary.h"\ "..\..\..\roadmap_file.h"\ *************** *** 4984,4989 **** --- 4994,5002 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_navigate.h"\ *************** *** 5012,5015 **** --- 5025,5029 ---- "..\..\..\editor\static\notes.h"\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_adjust.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ *************** *** 5017,5020 **** --- 5031,5035 ---- "..\..\..\roadmap_db.h"\ "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dialog.h"\ "..\..\..\roadmap_dictionary.h"\ "..\..\..\roadmap_file.h"\ *************** *** 5023,5028 **** --- 5038,5046 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ + "..\..\..\roadmap_layer.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_navigate.h"\ *************** *** 9102,9105 **** --- 9120,9124 ---- "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_navigate.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libdgl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libdgl Modified Files: libdgl.vcp Log Message: Update evc environment. Index: libdgl.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libdgl/libdgl.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libdgl.vcp 23 Apr 2006 13:32:24 -0000 1.2 --- libdgl.vcp 3 Sep 2006 18:20:35 -0000 1.3 *************** *** 47,51 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 47,51 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/libosroadmap Modified Files: libosroadmap.vcp Log Message: Update evc environment. Index: libosroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap/libosroadmap.vcp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** libosroadmap.vcp 27 Jul 2006 14:29:59 -0000 1.6 --- libosroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.7 *************** *** 183,187 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 183,187 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 723,726 **** --- 723,727 ---- DEP_CPP_ROADMAP_SO=\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_sound.h"\ *************** *** 733,736 **** --- 734,738 ---- DEP_CPP_ROADMAP_SO=\ "..\..\..\roadmap.h"\ + "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_sound.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/RoadGPS Modified Files: RoadGPS.vcp Log Message: Update evc environment. Index: RoadGPS.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS/RoadGPS.vcp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RoadGPS.vcp 18 Aug 2006 18:10:41 -0000 1.3 --- RoadGPS.vcp 3 Sep 2006 18:20:34 -0000 1.4 *************** *** 221,225 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 221,225 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 422,449 **** DEP_CPP_ROADM=\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ "..\..\wince_input_mon.h"\ NODEP_CPP_ROADM=\ ! "..\..\..\..\..\..\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ ! ".\inuserm.h"\ ! ".\ipapi.h"\ ! ".\ygshell.h"\ --- 422,461 ---- DEP_CPP_ROADM=\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\export\editor_sync.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_download.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ + "..\..\CEDevice.h"\ + "..\..\CEException.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "..\..\win32_serial.h"\ "..\..\wince_input_mon.h"\ + "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"notify.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"winuserm.h"\ NODEP_CPP_ROADM=\ ! "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544/Roadmap Modified Files: Roadmap.vcp Log Message: Update evc environment. Index: Roadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap/Roadmap.vcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Roadmap.vcp 9 Aug 2006 07:39:54 -0000 1.4 --- Roadmap.vcp 3 Sep 2006 18:20:34 -0000 1.5 *************** *** 223,227 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 223,227 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zd /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 *************** *** 232,236 **** LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM /MAPINFO:lines # SUBTRACT LINK32 /pdb:none --- 232,236 ---- LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /map /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM /MAPINFO:lines /MAPINFO:EXPORTS # SUBTRACT LINK32 /pdb:none *************** *** 492,496 **** "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ - "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ --- 492,495 ---- *************** *** 534,538 **** "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ - "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ --- 533,536 ---- |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:20:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3544 Modified Files: Roadmap.vcw Log Message: Update evc environment. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Roadmap.vcw 9 Aug 2006 07:39:54 -0000 1.9 --- Roadmap.vcw 3 Sep 2006 18:20:34 -0000 1.10 *************** *** 22,33 **** ############################################################################### Project: "RoadGPS"=.\RoadGPS\RoadGPS.vcp - Package Owner=<4> Package=<5> {{{ - begin source code control - RoadGPS - ..\.. - end source code control }}} --- 22,41 ---- ############################################################################### + Project: "FreeMap"=.\FreeMap\FreeMap.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "RoadGPS"=.\RoadGPS\RoadGPS.vcp - Package Owner=<4> Package=<5> {{{ }}} *************** *** 63,70 **** Package=<5> {{{ - begin source code control - Roadmap - ..\.. - end source code control }}} --- 71,74 ---- *************** *** 172,179 **** Package=<5> {{{ - begin source code control - libguiroadgps - ..\.. - end source code control }}} --- 176,179 ---- *************** *** 188,195 **** Package=<5> {{{ - begin source code control - libguiroadmap - ..\.. - end source code control }}} --- 188,191 ---- *************** *** 204,211 **** Package=<5> {{{ - begin source code control - libosroadmap - ..\.. - end source code control }}} --- 200,203 ---- *************** *** 220,227 **** Package=<5> {{{ - begin source code control - libroadmap - ..\.. - end source code control }}} --- 212,215 ---- *************** *** 236,243 **** Package=<5> {{{ - begin source code control - libwinceguiroadmap - ..\.. - end source code control }}} --- 224,227 ---- *************** *** 267,274 **** Package=<5> {{{ - begin source code control - rdmghost - ..\..\.. - end source code control }}} --- 251,254 ---- |
|
From: Ehud S. <esh...@us...> - 2006-09-03 18:19:18
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3091 Modified Files: roadmap_main.cpp Log Message: Separate FreeMap and RoadMap. Only sync once every one hour. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** roadmap_main.cpp 18 Aug 2006 18:07:17 -0000 1.16 --- roadmap_main.cpp 3 Sep 2006 18:19:15 -0000 1.17 *************** *** 30,33 **** --- 30,34 ---- #include "resource.h" #include <winsock.h> + #include <time.h> #ifdef UNDER_CE #include <aygshell.h> *************** *** 41,44 **** --- 42,47 ---- #endif + #define MIN_SYNC_TIME 1*3600 + #ifdef WIN32_PROFILE #include <C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h> *************** *** 133,136 **** --- 136,141 ---- static RoadMapConfigDescriptor RoadMapConfigAutoSync = ROADMAP_CONFIG_ITEM("FreeMap", "Auto sync"); + static RoadMapConfigDescriptor RoadMapConfigLastSync = + ROADMAP_CONFIG_ITEM("FreeMap", "Last sync"); #endif *************** *** 156,160 **** ! #ifndef _ROADGPS static void roadmap_main_start_sync (void) { --- 161,191 ---- ! #ifndef _ROADGPS ! ! static int roadmap_main_should_sync (void) { ! ! roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); ! ! if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { ! return 0; ! } else { ! unsigned int last_sync_time = ! roadmap_config_get_integer(&RoadMapConfigLastSync); ! ! if (last_sync_time && ! ((last_sync_time + MIN_SYNC_TIME) > time(NULL))) { ! ! return 0; ! } ! ! roadmap_config_set_integer (&RoadMapConfigLastSync, time(NULL)); ! roadmap_config_save (0); ! } ! ! return 1; ! } ! ! static void roadmap_main_start_sync (void) { *************** *** 165,169 **** RoadMapMainSync = true; ! Sleep(1000); --- 196,200 ---- RoadMapMainSync = true; ! Sleep(1000); *************** *** 380,393 **** roadmap_config_initialize (); roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); ! ! if (roadmap_config_match(&RoadMapConfigAutoSync, "No")) { ! return 0; ! } ! roadmap_lang_initialize (); roadmap_download_initialize (); ! editor_main_initialize (); ! roadmap_main_start_sync (); return 0; } --- 411,422 ---- roadmap_config_initialize (); roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); ! ! if (!roadmap_main_should_sync ()) return 0; roadmap_lang_initialize (); roadmap_download_initialize (); ! editor_main_initialize (); ! editor_main_set (1); ! roadmap_main_start_sync (); return 0; } *************** *** 523,526 **** --- 552,556 ---- #ifdef UNDER_CE SHMENUBARINFO mbi; + bool create_menu; memset(&mbi, 0, sizeof(SHMENUBARINFO)); *************** *** 536,541 **** // If I try to just create an empty menu, it does't work! (can't // add items to it). ! if (roadmap_config_match (&RoadMapConfigMenuBar, "no") || ! !SHCreateMenuBar(&mbi)) { RoadMapMainMenuBar = NULL; --- 566,575 ---- // If I try to just create an empty menu, it does't work! (can't // add items to it). ! #ifdef _ROADGPS ! create_menu = true; ! #else ! create_menu = roadmap_config_match (&RoadMapConfigMenuBar, "Yes") != 0; ! #endif ! if (!create_menu || !SHCreateMenuBar(&mbi)) { RoadMapMainMenuBar = NULL; *************** *** 798,802 **** #ifdef UNDER_CE roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigMenuBar, "no", "yes", NULL); #else style |= WS_OVERLAPPEDWINDOW; --- 832,840 ---- #ifdef UNDER_CE roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigMenuBar, "No", "Yes", NULL); ! roadmap_config_declare_enumeration ! ("preferences", &RoadMapConfigAutoSync, "Yes", "No", NULL); ! roadmap_config_declare ! ("session", &RoadMapConfigLastSync, "0"); #else style |= WS_OVERLAPPEDWINDOW; *************** *** 829,833 **** } #endif ! } --- 867,876 ---- } #endif ! ! #ifdef FREEMAP_IL ! editor_main_check_map (); ! editor_main_set (1); ! #endif ! } *************** *** 1041,1046 **** --- 1084,1094 ---- void roadmap_main_add_canvas (void) { + #ifndef _ROADGPS roadmap_main_toggle_full_screen (); + #endif + roadmap_canvas_new(RoadMapMainWindow, RoadMapMainToolbar); + + #ifdef FREEMAP_IL RoadMapImage image = roadmap_canvas_load_image (roadmap_path_user(), "icons\\welcome.bmp"); *************** *** 1099,1102 **** --- 1147,1151 ---- Sleep (1000); } + #endif } |
