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: Ehud S. <esh...@us...> - 2006-04-23 13:32:31
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libguiroadgps Modified Files: libguiroadgps.vcp Log Message: Update evc4 project files. Index: libguiroadgps.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadgps/libguiroadgps.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libguiroadgps.vcp 16 Dec 2005 14:43:04 -0000 1.2 --- libguiroadgps.vcp 23 Apr 2006 13:32:25 -0000 1.3 *************** *** 209,213 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 209,213 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 362,365 **** --- 362,366 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 514,517 **** --- 515,519 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 682,685 **** --- 684,688 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 836,839 **** --- 839,843 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:31
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/fribidi Added Files: fribidi.vcp Log Message: Update evc4 project files. --- NEW FILE: fribidi.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="fribidi" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304 CFG=fribidi - 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 "fribidi.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 "fribidi.vcn" CFG="fribidi - Win32 (WCE ARMV4) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "fribidi - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "fribidi - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "fribidi - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 CPP=clarm.exe !IF "$(CFG)" == "fribidi - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /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 # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "fribidi - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "WIN32" /M$(CECrtMTDebug) /c # SUBTRACT CPP /YX LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "fribidi - Win32 (WCE ARMV4) Profiler" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Profiler" # PROP BASE Intermediate_Dir "ARMV4Profiler" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Profiler" # PROP Intermediate_Dir "ARMV4Profiler" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D "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" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /Zi /D "_LIB" /D "WIN32" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ENDIF # Begin Target # Name "fribidi - Win32 (WCE ARMV4) Release" # Name "fribidi - Win32 (WCE ARMV4) Debug" # Name "fribidi - Win32 (WCE ARMV4) Profiler" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\fribidi\fribidi.c DEP_CPP_FRIBI=\ "..\..\..\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_mem.h"\ "..\..\..\fribidi\fribidi_types.h"\ "..\..\..\fribidi\fribidi_types.i"\ "..\..\..\fribidi\fribidi_unicode.h"\ # End Source File # Begin Source File SOURCE=..\..\..\fribidi\fribidi_char_type.c DEP_CPP_FRIBID=\ "..\..\..\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_tab_char_type_2.i"\ "..\..\..\fribidi\fribidi_tab_char_type_9.i"\ "..\..\..\fribidi\fribidi_types.h"\ "..\..\..\fribidi\fribidi_types.i"\ "..\..\..\fribidi\fribidi_unicode.h"\ NODEP_CPP_FRIBID=\ "..\..\..\fribidi\fribidi_tab_char_type_3.i"\ "..\..\..\fribidi\fribidi_tab_char_type_4.i"\ "..\..\..\fribidi\fribidi_tab_char_type_5.i"\ "..\..\..\fribidi\fribidi_tab_char_type_6.i"\ "..\..\..\fribidi\fribidi_tab_char_type_7.i"\ "..\..\..\fribidi\fribidi_tab_char_type_8.i"\ # End Source File # Begin Source File SOURCE=..\..\..\fribidi\fribidi_mem.c DEP_CPP_FRIBIDI=\ "..\..\..\fribidi\fribidi_config.h"\ "..\..\..\fribidi\fribidi_mem.h"\ "..\..\..\fribidi\fribidi_types.h"\ "..\..\..\fribidi\fribidi_types.i"\ # End Source File # Begin Source File SOURCE=..\..\..\fribidi\fribidi_mirroring.c DEP_CPP_FRIBIDI_=\ "..\..\..\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_tab_mirroring.i"\ "..\..\..\fribidi\fribidi_types.h"\ "..\..\..\fribidi\fribidi_types.i"\ "..\..\..\fribidi\fribidi_unicode.h"\ # End Source File # Begin Source File SOURCE=..\..\..\fribidi\fribidi_types.c DEP_CPP_FRIBIDI_T=\ "..\..\..\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"\ # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:29
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libwinceguiroadmap Modified Files: libwinceguiroadmap.vcp Log Message: Update evc4 project files. Index: libwinceguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libwinceguiroadmap/libwinceguiroadmap.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libwinceguiroadmap.vcp 16 Dec 2005 14:43:58 -0000 1.2 --- libwinceguiroadmap.vcp 23 Apr 2006 13:32:25 -0000 1.3 *************** *** 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)" == "libwinceguiroadmap - 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)" == "libwinceguiroadmap - 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)" == "libwinceguiroadmap - 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)" == "libwinceguiroadmap - Win32 (WCE x86) Release" *************** *** 105,109 **** CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 105,109 ---- CPP=cl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Oxs /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 131,135 **** CPP=cl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 131,135 ---- CPP=cl.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c ! # ADD CPP /nologo /W3 /Zi /Od /I "./wince_os" /I "../../" /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 157,161 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 157,161 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg23/font_freetype" /I "../../../freetype/include" /I "../../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 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 /I "c:\projects\agg23\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 *************** *** 209,213 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 209,213 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /I "c:\projects\agg23\font_freetype" /I "../../../freetype/include" /I "../../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 233,262 **** # Begin Source File ! SOURCE=..\..\..\win32\roadmap_canvas.c !IF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Release" - DEP_CPP_ROADM=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_canvas.h"\ - "..\..\..\roadmap_gui.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\colors.h"\ - "..\..\roadmap_win32.h"\ - "..\..\roadmap_wincecanvas.h"\ - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug" - DEP_CPP_ROADM=\ - "..\..\..\roadmap.h"\ - "..\..\..\roadmap_canvas.h"\ - "..\..\..\roadmap_gui.h"\ - "..\..\..\roadmap_types.h"\ - "..\..\colors.h"\ - "..\..\roadmap_win32.h"\ - "..\..\roadmap_wincecanvas.h"\ - - !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release" --- 233,242 ---- # Begin Source File ! SOURCE=..\..\roadmap_canvas.cpp !IF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Release" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARM) Debug" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Release" *************** *** 269,273 **** --- 249,277 ---- "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "C:\Projects\agg23\include\agg_array.h"\ + "C:\Projects\agg23\include\agg_basics.h"\ + "C:\Projects\agg23\include\agg_clip_liang_barsky.h"\ + "C:\Projects\agg23\include\agg_color_rgba.h"\ + "C:\Projects\agg23\include\agg_config.h"\ + "C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\ + "C:\Projects\agg23\include\agg_conv_stroke.h"\ + "C:\Projects\agg23\include\agg_curves.h"\ + "C:\Projects\agg23\include\agg_gamma_functions.h"\ + "C:\Projects\agg23\include\agg_math.h"\ + "C:\Projects\agg23\include\agg_math_stroke.h"\ + "C:\Projects\agg23\include\agg_path_storage.h"\ + "C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline.h"\ + "C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\ + "C:\Projects\agg23\include\agg_render_scanlines.h"\ + "C:\Projects\agg23\include\agg_renderer_base.h"\ + "C:\Projects\agg23\include\agg_renderer_scanline.h"\ + "C:\Projects\agg23\include\agg_rendering_buffer.h"\ + "C:\Projects\agg23\include\agg_scanline_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_p.h"\ + "C:\Projects\agg23\include\agg_vcgen_stroke.h"\ + "C:\Projects\agg23\include\agg_vertex_sequence.h"\ + # ADD CPP /I "C:\Projects\agg23\include" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE x86) Debug" *************** *** 281,321 **** --- 285,534 ---- "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "C:\Projects\agg23\include\agg_array.h"\ + "C:\Projects\agg23\include\agg_basics.h"\ + "C:\Projects\agg23\include\agg_clip_liang_barsky.h"\ + "C:\Projects\agg23\include\agg_color_rgba.h"\ + "C:\Projects\agg23\include\agg_config.h"\ + "C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\ + "C:\Projects\agg23\include\agg_conv_stroke.h"\ + "C:\Projects\agg23\include\agg_curves.h"\ + "C:\Projects\agg23\include\agg_gamma_functions.h"\ + "C:\Projects\agg23\include\agg_math.h"\ + "C:\Projects\agg23\include\agg_math_stroke.h"\ + "C:\Projects\agg23\include\agg_path_storage.h"\ + "C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline.h"\ + "C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\ + "C:\Projects\agg23\include\agg_render_scanlines.h"\ + "C:\Projects\agg23\include\agg_renderer_base.h"\ + "C:\Projects\agg23\include\agg_renderer_scanline.h"\ + "C:\Projects\agg23\include\agg_rendering_buffer.h"\ + "C:\Projects\agg23\include\agg_scanline_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_p.h"\ + "C:\Projects\agg23\include\agg_vcgen_stroke.h"\ + "C:\Projects\agg23\include\agg_vertex_sequence.h"\ + # ADD CPP /I "C:\Projects\agg23\include" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Debug" DEP_CPP_ROADM=\ + "..\..\..\agg23\font_freetype\agg_font_freetype.h"\ + "..\..\..\freetype\include\freetype\config\ftheader.h"\ + "..\..\..\freetype\include\ft2build.h"\ + "..\..\..\fribidi\fribidi.h"\ + "..\..\..\fribidi\fribidi_char_sets.h"\ + "..\..\..\fribidi\fribidi_char_sets.i"\ + "..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1255.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1256.h"\ + "..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\ + "..\..\..\fribidi\fribidi_char_sets_utf8.h"\ + "..\..\..\fribidi\fribidi_config.h"\ + "..\..\..\fribidi\fribidi_types.h"\ + "..\..\..\fribidi\fribidi_types.i"\ + "..\..\..\fribidi\fribidi_unicode.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\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"\ + "C:\Projects\agg23\include\agg_array.h"\ + "C:\Projects\agg23\include\agg_basics.h"\ + "C:\Projects\agg23\include\agg_clip_liang_barsky.h"\ + "C:\Projects\agg23\include\agg_color_rgba.h"\ + "C:\Projects\agg23\include\agg_config.h"\ + "C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\ + "C:\Projects\agg23\include\agg_conv_contour.h"\ + "C:\Projects\agg23\include\agg_conv_curve.h"\ + "C:\Projects\agg23\include\agg_conv_stroke.h"\ + "C:\Projects\agg23\include\agg_conv_transform.h"\ + "C:\Projects\agg23\include\agg_curves.h"\ + "C:\Projects\agg23\include\agg_dda_line.h"\ + "C:\Projects\agg23\include\agg_ellipse.h"\ + "C:\Projects\agg23\include\agg_ellipse_bresenham.h"\ + "C:\Projects\agg23\include\agg_font_cache_manager.h"\ + "C:\Projects\agg23\include\agg_gamma_functions.h"\ + "C:\Projects\agg23\include\agg_line_aa_basics.h"\ + "C:\Projects\agg23\include\agg_math.h"\ + "C:\Projects\agg23\include\agg_math_stroke.h"\ + "C:\Projects\agg23\include\agg_path_storage.h"\ + "C:\Projects\agg23\include\agg_path_storage_integer.h"\ + "C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\ + "C:\Projects\agg23\include\agg_render_scanlines.h"\ + "C:\Projects\agg23\include\agg_renderer_base.h"\ + "C:\Projects\agg23\include\agg_renderer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_renderer_primitives.h"\ + "C:\Projects\agg23\include\agg_renderer_scanline.h"\ + "C:\Projects\agg23\include\agg_rendering_buffer.h"\ + "C:\Projects\agg23\include\agg_scanline_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_p.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_aa.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_u.h"\ + "C:\Projects\agg23\include\agg_trans_affine.h"\ + "C:\Projects\agg23\include\agg_vcgen_contour.h"\ + "C:\Projects\agg23\include\agg_vcgen_stroke.h"\ + "C:\Projects\agg23\include\agg_vertex_sequence.h"\ + # ADD CPP /I "C:\Projects\agg23\include" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Release" DEP_CPP_ROADM=\ + "..\..\..\freetype\include\freetype\config\ftheader.h"\ + "..\..\..\freetype\include\ft2build.h"\ + "..\..\..\fribidi\fribidi.h"\ + "..\..\..\fribidi\fribidi_char_sets.h"\ + "..\..\..\fribidi\fribidi_char_sets.i"\ + "..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1255.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1256.h"\ + "..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\ + "..\..\..\fribidi\fribidi_char_sets_utf8.h"\ + "..\..\..\fribidi\fribidi_config.h"\ + "..\..\..\fribidi\fribidi_types.h"\ + "..\..\..\fribidi\fribidi_types.i"\ + "..\..\..\fribidi\fribidi_unicode.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_types.h"\ "..\..\colors.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "c:\projects\agg23\font_freetype\agg_font_freetype.h"\ + "C:\Projects\agg23\include\agg_array.h"\ + "C:\Projects\agg23\include\agg_basics.h"\ + "C:\Projects\agg23\include\agg_clip_liang_barsky.h"\ + "C:\Projects\agg23\include\agg_color_rgba.h"\ + "C:\Projects\agg23\include\agg_config.h"\ + "C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\ + "C:\Projects\agg23\include\agg_conv_contour.h"\ + "C:\Projects\agg23\include\agg_conv_curve.h"\ + "C:\Projects\agg23\include\agg_conv_stroke.h"\ + "C:\Projects\agg23\include\agg_conv_transform.h"\ + "C:\Projects\agg23\include\agg_curves.h"\ + "C:\Projects\agg23\include\agg_dda_line.h"\ + "C:\Projects\agg23\include\agg_ellipse.h"\ + "C:\Projects\agg23\include\agg_ellipse_bresenham.h"\ + "C:\Projects\agg23\include\agg_font_cache_manager.h"\ + "C:\Projects\agg23\include\agg_gamma_functions.h"\ + "C:\Projects\agg23\include\agg_line_aa_basics.h"\ + "C:\Projects\agg23\include\agg_math.h"\ + "C:\Projects\agg23\include\agg_math_stroke.h"\ + "C:\Projects\agg23\include\agg_path_storage.h"\ + "C:\Projects\agg23\include\agg_path_storage_integer.h"\ + "C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\ + "C:\Projects\agg23\include\agg_render_scanlines.h"\ + "C:\Projects\agg23\include\agg_renderer_base.h"\ + "C:\Projects\agg23\include\agg_renderer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_renderer_primitives.h"\ + "C:\Projects\agg23\include\agg_renderer_scanline.h"\ + "C:\Projects\agg23\include\agg_rendering_buffer.h"\ + "C:\Projects\agg23\include\agg_scanline_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_p.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_aa.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_u.h"\ + "C:\Projects\agg23\include\agg_trans_affine.h"\ + "C:\Projects\agg23\include\agg_vcgen_contour.h"\ + "C:\Projects\agg23\include\agg_vcgen_stroke.h"\ + "C:\Projects\agg23\include\agg_vertex_sequence.h"\ + # ADD CPP /I "C:\Projects\agg23\include" !ELSEIF "$(CFG)" == "libwinceguiroadmap - Win32 (WCE ARMV4) Profiler" DEP_CPP_ROADM=\ + "..\..\..\freetype\include\freetype\config\ftheader.h"\ + "..\..\..\freetype\include\ft2build.h"\ + "..\..\..\fribidi\fribidi.h"\ + "..\..\..\fribidi\fribidi_char_sets.h"\ + "..\..\..\fribidi\fribidi_char_sets.i"\ + "..\..\..\fribidi\fribidi_char_sets_cap_rtl.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1255.h"\ + "..\..\..\fribidi\fribidi_char_sets_cp1256.h"\ + "..\..\..\fribidi\fribidi_char_sets_isiri_3342.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_6.h"\ + "..\..\..\fribidi\fribidi_char_sets_iso8859_8.h"\ + "..\..\..\fribidi\fribidi_char_sets_utf8.h"\ + "..\..\..\fribidi\fribidi_config.h"\ + "..\..\..\fribidi\fribidi_types.h"\ + "..\..\..\fribidi\fribidi_types.i"\ + "..\..\..\fribidi\fribidi_unicode.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_types.h"\ "..\..\colors.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + "c:\projects\agg23\font_freetype\agg_font_freetype.h"\ + "C:\Projects\agg23\include\agg_array.h"\ + "C:\Projects\agg23\include\agg_basics.h"\ + "C:\Projects\agg23\include\agg_clip_liang_barsky.h"\ + "C:\Projects\agg23\include\agg_color_rgba.h"\ + "C:\Projects\agg23\include\agg_config.h"\ + "C:\Projects\agg23\include\agg_conv_adaptor_vcgen.h"\ + "C:\Projects\agg23\include\agg_conv_contour.h"\ + "C:\Projects\agg23\include\agg_conv_curve.h"\ + "C:\Projects\agg23\include\agg_conv_stroke.h"\ + "C:\Projects\agg23\include\agg_conv_transform.h"\ + "C:\Projects\agg23\include\agg_curves.h"\ + "C:\Projects\agg23\include\agg_dda_line.h"\ + "C:\Projects\agg23\include\agg_ellipse.h"\ + "C:\Projects\agg23\include\agg_ellipse_bresenham.h"\ + "C:\Projects\agg23\include\agg_font_cache_manager.h"\ + "C:\Projects\agg23\include\agg_gamma_functions.h"\ + "C:\Projects\agg23\include\agg_line_aa_basics.h"\ + "C:\Projects\agg23\include\agg_math.h"\ + "C:\Projects\agg23\include\agg_math_stroke.h"\ + "C:\Projects\agg23\include\agg_path_storage.h"\ + "C:\Projects\agg23\include\agg_path_storage_integer.h"\ + "C:\Projects\agg23\include\agg_pixfmt_rgb_packed.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline.h"\ + "C:\Projects\agg23\include\agg_rasterizer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_rasterizer_scanline_aa.h"\ + "C:\Projects\agg23\include\agg_render_scanlines.h"\ + "C:\Projects\agg23\include\agg_renderer_base.h"\ + "C:\Projects\agg23\include\agg_renderer_outline_aa.h"\ + "C:\Projects\agg23\include\agg_renderer_primitives.h"\ + "C:\Projects\agg23\include\agg_renderer_scanline.h"\ + "C:\Projects\agg23\include\agg_rendering_buffer.h"\ + "C:\Projects\agg23\include\agg_scanline_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_p.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_aa.h"\ + "C:\Projects\agg23\include\agg_scanline_storage_bin.h"\ + "C:\Projects\agg23\include\agg_scanline_u.h"\ + "C:\Projects\agg23\include\agg_trans_affine.h"\ + "C:\Projects\agg23\include\agg_vcgen_contour.h"\ + "C:\Projects\agg23\include\agg_vcgen_stroke.h"\ + "C:\Projects\agg23\include\agg_vertex_sequence.h"\ + # ADD CPP /I "C:\Projects\agg23\include" !ENDIF *************** *** 382,390 **** "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ NODEP_CPP_ROADMA=\ - ".\inuserm.h"\ - ".\ipapi.h"\ - ".\ygshell.h"\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ --- 595,603 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"winuserm.h"\ NODEP_CPP_ROADMA=\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ *************** *** 414,422 **** "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ - {$(INCLUDE)}"aygshell.h"\ - {$(INCLUDE)}"sipapi.h"\ - {$(INCLUDE)}"winuserm.h"\ NODEP_CPP_ROADMA=\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ --- 627,635 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ NODEP_CPP_ROADMA=\ + ".\inuserm.h"\ + ".\ipapi.h"\ + ".\ygshell.h"\ "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:29
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libroadmap Modified Files: libroadmap.vcp Log Message: Update evc4 project files. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** libroadmap.vcp 22 Mar 2006 08:54:49 -0000 1.6 --- libroadmap.vcp 23 Apr 2006 13:32:25 -0000 1.7 *************** *** 157,161 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "l:\shared\roadmap_editor\src" /I "l:\shared\roadmap_editor\src\dglib" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 157,161 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c ! # ADD CPP /nologo /W3 /Zi /Od /I "..\..\.." /I "..\..\..\dglib" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 209,213 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /I "l:\shared\roadmap_editor\src" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 209,213 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /I "l:\shared\roadmap_editor\src" /I "l:\shared\roadmap_editor\src\dglib" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 888,891 **** --- 888,892 ---- "..\..\..\editor\db\editor_dictionary.h"\ "..\..\..\editor\db\editor_line.h"\ + "..\..\..\editor\db\editor_override.h"\ "..\..\..\editor\db\editor_point.h"\ "..\..\..\editor\db\editor_route.h"\ *************** *** 895,898 **** --- 896,900 ---- "..\..\..\editor\db\editor_trkseg.h"\ "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ "..\..\..\editor\export\editor_export.h"\ "..\..\..\editor\track\editor_track_main.h"\ *************** *** 908,913 **** --- 910,918 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ "..\..\..\roadmap_line_route.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ *************** *** 919,922 **** --- 924,928 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 927,930 **** --- 933,937 ---- "..\..\..\editor\db\editor_dictionary.h"\ "..\..\..\editor\db\editor_line.h"\ + "..\..\..\editor\db\editor_override.h"\ "..\..\..\editor\db\editor_point.h"\ "..\..\..\editor\db\editor_route.h"\ *************** *** 934,937 **** --- 941,945 ---- "..\..\..\editor\db\editor_trkseg.h"\ "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ "..\..\..\editor\export\editor_export.h"\ "..\..\..\editor\track\editor_track_main.h"\ *************** *** 947,952 **** --- 955,963 ---- "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_layer.h"\ + "..\..\..\roadmap_line.h"\ "..\..\..\roadmap_line_route.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ *************** *** 958,961 **** --- 969,973 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1138,1141 **** --- 1150,1154 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1180,1183 **** --- 1193,1197 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1278,1281 **** --- 1292,1296 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1302,1305 **** --- 1317,1321 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1505,1508 **** --- 1521,1525 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1537,1540 **** --- 1554,1558 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 1952,1955 **** --- 1970,1974 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2003,2006 **** --- 2022,2026 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2424,2427 **** --- 2444,2448 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2443,2446 **** --- 2464,2468 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2595,2598 **** --- 2617,2621 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2631,2634 **** --- 2654,2658 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2783,2786 **** --- 2807,2811 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2818,2821 **** --- 2843,2847 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2942,2945 **** --- 2968,2972 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 2970,2973 **** --- 2997,3001 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3154,3157 **** --- 3182,3186 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3198,3201 **** --- 3227,3231 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3326,3329 **** --- 3356,3360 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3355,3358 **** --- 3386,3390 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3417,3420 **** --- 3449,3458 ---- DEP_CPP_NAVIG=\ + "..\..\..\dglib\avl.h"\ + "..\..\..\dglib\graph.h"\ + "..\..\..\dglib\heap.h"\ + "..\..\..\dglib\tavl.h"\ + "..\..\..\dglib\tree.h"\ + "..\..\..\dglib\type.h"\ "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ *************** *** 3432,3439 **** "..\..\roadmap_win32.h"\ - NODEP_CPP_NAVIG=\ - "..\..\..\navigate\graph.h"\ - "..\..\..\navigate\type.h"\ - !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" --- 3470,3473 ---- *************** *** 3465,3468 **** --- 3499,3508 ---- DEP_CPP_NAVIG=\ + "..\..\..\dglib\avl.h"\ + "..\..\..\dglib\graph.h"\ + "..\..\..\dglib\heap.h"\ + "..\..\..\dglib\tavl.h"\ + "..\..\..\dglib\tree.h"\ + "..\..\..\dglib\type.h"\ "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ *************** *** 3480,3487 **** "..\..\roadmap_win32.h"\ - NODEP_CPP_NAVIG=\ - "..\..\..\navigate\graph.h"\ - "..\..\..\navigate\type.h"\ - !ENDIF --- 3520,3523 ---- *************** *** 3579,3582 **** --- 3615,3624 ---- DEP_CPP_NAVIGA=\ + "..\..\..\dglib\avl.h"\ + "..\..\..\dglib\graph.h"\ + "..\..\..\dglib\heap.h"\ + "..\..\..\dglib\tavl.h"\ + "..\..\..\dglib\tree.h"\ + "..\..\..\dglib\type.h"\ "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ *************** *** 3611,3618 **** "..\..\win32_serial.h"\ - NODEP_CPP_NAVIGA=\ - "..\..\..\navigate\graph.h"\ - "..\..\..\navigate\type.h"\ - !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" --- 3653,3656 ---- *************** *** 3661,3664 **** --- 3699,3708 ---- DEP_CPP_NAVIGA=\ + "..\..\..\dglib\avl.h"\ + "..\..\..\dglib\graph.h"\ + "..\..\..\dglib\heap.h"\ + "..\..\..\dglib\tavl.h"\ + "..\..\..\dglib\tree.h"\ + "..\..\..\dglib\type.h"\ "..\..\..\navigate\navigate_graph.h"\ "..\..\..\navigate\navigate_main.h"\ *************** *** 3693,3700 **** "..\..\win32_serial.h"\ - NODEP_CPP_NAVIGA=\ - "..\..\..\navigate\graph.h"\ - "..\..\..\navigate\type.h"\ - !ENDIF --- 3737,3740 ---- *************** *** 3872,3875 **** --- 3912,3916 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 3889,3892 **** --- 3930,3934 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4417,4420 **** --- 4459,4463 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4441,4444 **** --- 4484,4488 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4603,4606 **** --- 4647,4651 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4630,4633 **** --- 4675,4679 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4768,4771 **** --- 4814,4818 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4791,4794 **** --- 4838,4842 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4875,4878 **** --- 4923,4927 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 4891,4894 **** --- 4940,4944 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 5126,5129 **** --- 5176,5180 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 5141,5144 **** --- 5192,5196 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 5215,5218 **** --- 5267,5271 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\win32_serial.h"\ *************** *** 5226,5229 **** --- 5279,5283 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\win32_serial.h"\ *************** *** 5613,5616 **** --- 5667,5671 ---- "..\..\..\roadmap_square.h"\ "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_turns.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ *************** *** 5638,5641 **** --- 5693,5697 ---- "..\..\..\roadmap_square.h"\ "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_turns.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ *************** *** 6181,6184 **** --- 6237,6241 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 6198,6201 **** --- 6255,6259 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 7189,7192 **** --- 7247,7251 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 7205,7208 **** --- 7264,7268 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:29
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libosroadmap Modified Files: libosroadmap.vcp Log Message: Update evc4 project files. Index: libosroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libosroadmap/libosroadmap.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libosroadmap.vcp 16 Dec 2005 14:43:33 -0000 1.2 --- libosroadmap.vcp 23 Apr 2006 13:32:25 -0000 1.3 *************** *** 209,213 **** CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo --- 209,213 ---- CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c ! # ADD CPP /nologo /W3 /Zi /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo *************** *** 579,582 **** --- 579,583 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 588,591 **** --- 589,593 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 597,600 **** --- 599,603 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ *************** *** 905,908 **** --- 908,912 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ "..\..\wince_input_mon.h"\ *************** *** 922,925 **** --- 926,930 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ "..\..\wince_input_mon.h"\ *************** *** 939,942 **** --- 944,948 ---- "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ "..\..\wince_input_mon.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:29
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/rdmghost Modified Files: rdmghost.vcp Log Message: Update evc4 project files. Index: rdmghost.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/rdmghost/rdmghost.vcp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rdmghost.vcp 15 Oct 2005 22:19:23 -0000 1.1.1.1 --- rdmghost.vcp 23 Apr 2006 13:32:25 -0000 1.2 *************** *** 27,30 **** --- 27,33 ---- # PROP Scc_LocalPath "..\..\..\.." # PROP ATL_Project 2 + CPP=clarm.exe + MTL=midl.exe + RSC=rc.exe !IF "$(CFG)" == "rdmghost - Win32 (WCE ARMV4) Release" *************** *** 44,62 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" ! LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 ! CPP=clarm.exe ! # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "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 ! RSC=rc.exe ! # 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 !ELSEIF "$(CFG)" == "rdmghost - Win32 (WCE ARMV4) Debug" --- 47,63 ---- # 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 ! # SUBTRACT CPP /O<none> ! # 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)" == "rdmghost - Win32 (WCE ARMV4) Debug" *************** *** 77,95 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! LINK32=link.exe ! # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM ! # ADD LINK32 commctrl.lib coredll.lib aygshell.lib ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo ! MTL=midl.exe ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 ! CPP=clarm.exe ! # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "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 ! RSC=rc.exe ! # 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 !ENDIF --- 78,93 ---- # PROP Ignore_Export_Lib 0 # 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 ws2.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:28
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034 Modified Files: Roadmap.vcw Log Message: Update evc4 project files. Index: Roadmap.vcw =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/Roadmap.vcw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Roadmap.vcw 22 Mar 2006 08:54:34 -0000 1.2 --- Roadmap.vcw 23 Apr 2006 13:32:24 -0000 1.3 *************** *** 77,80 **** --- 77,101 ---- Project_Dep_Name libdgl End Project Dependency + Begin Project Dependency + Project_Dep_Name libft + End Project Dependency + Begin Project Dependency + Project_Dep_Name fribidi + End Project Dependency + Begin Project Dependency + Project_Dep_Name agg23 + End Project Dependency + }}} + + ############################################################################### + + Project: "agg23"=.\agg23\agg23.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ }}} *************** *** 99,102 **** --- 120,135 ---- ############################################################################### + Project: "fribidi"=.\fribidi\fribidi.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "libdgl"=.\libdgl\libdgl.vcp - Package Owner=<4> *************** *** 111,114 **** --- 144,159 ---- ############################################################################### + Project: "libft"=.\libft\libft.vcp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "libguiroadgps"=.\libguiroadgps\libguiroadgps.vcp - Package Owner=<4> |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:28
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/RoadGPS Modified Files: RoadGPS.vcp Log Message: Update evc4 project files. Index: RoadGPS.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS/RoadGPS.vcp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** RoadGPS.vcp 15 Oct 2005 22:19:23 -0000 1.1.1.1 --- RoadGPS.vcp 23 Apr 2006 13:32:24 -0000 1.2 *************** *** 51,69 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" - LINK32=link.exe - # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - MTL=midl.exe - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /Oxs /M$(CECrtMT) /c RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" --- 51,69 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /Oxs /M$(CECrtMT) /c + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" *************** *** 84,102 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" - LINK32=link.exe - # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - MTL=midl.exe - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c - # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_ROADGPS" /YX /M$(CECrtMTDebug) /c RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" --- 84,102 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c + # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_ROADGPS" /YX /M$(CECrtMTDebug) /c + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + LINK32=link.exe + # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" *************** *** 222,225 **** --- 222,226 ---- # 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 + # SUBTRACT CPP /O<none> MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:28
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libdgl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/libdgl Modified Files: libdgl.vcp Log Message: Update evc4 project files. Index: libdgl.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libdgl/libdgl.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libdgl.vcp 22 Mar 2006 09:14:10 -0000 1.1 --- libdgl.vcp 23 Apr 2006 13:32:24 -0000 1.2 *************** *** 20,23 **** --- 20,24 ---- !MESSAGE "libdgl - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "libdgl - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") + !MESSAGE "libdgl - Win32 (WCE ARMV4) Profiler" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE *************** *** 79,82 **** --- 80,108 ---- # ADD BSC32 /nologo + !ELSEIF "$(CFG)" == "libdgl - Win32 (WCE ARMV4) Profiler" + + # PROP BASE Use_MFC 0 + # PROP BASE Use_Debug_Libraries 0 + # PROP BASE Output_Dir "ARMV4Profiler" + # PROP BASE Intermediate_Dir "ARMV4Profiler" + # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" + # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP BASE Target_Dir "" + # PROP Use_MFC 0 + # PROP Use_Debug_Libraries 0 + # PROP Output_Dir "ARMV4Profiler" + # PROP Intermediate_Dir "ARMV4Profiler" + # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" + # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" + # PROP Target_Dir "" + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /Zi /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "WIN32_PROFILE" /YX /O2 /M$(CECrtMT) /fastcap /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + !ENDIF *************** *** 85,88 **** --- 111,115 ---- # Name "libdgl - Win32 (WCE ARMV4) Release" # Name "libdgl - Win32 (WCE ARMV4) Debug" + # Name "libdgl - Win32 (WCE ARMV4) Profiler" # Begin Group "Source Files" |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:32:28
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/agg23 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17034/agg23 Added Files: agg23.vcp Log Message: Update evc4 project files. --- NEW FILE: agg23.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="agg23" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304 CFG=agg23 - 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 "agg23.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 "agg23.vcn" CFG="agg23 - Win32 (WCE ARMV4) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "agg23 - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "agg23 - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 CPP=clarm.exe !IF "$(CFG)" == "agg23 - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "../../../agg23/include" /I "../../../freetype/include" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "agg23 - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../../agg23/include" /I "../../../freetype/include" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /M$(CECrtMTDebug) /c # SUBTRACT CPP /YX LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ENDIF # Begin Target # Name "agg23 - Win32 (WCE ARMV4) Release" # Name "agg23 - Win32 (WCE ARMV4) Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\agg23\src\agg_bezier_arc.cpp DEP_CPP_AGG_B=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_bezier_arc.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_conv_transform.h"\ "..\..\..\agg23\include\agg_trans_affine.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_curves.cpp DEP_CPP_AGG_C=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_curves.h"\ "..\..\..\agg23\include\agg_math.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\font_freetype\agg_font_freetype.cpp DEP_CPP_AGG_F=\ "..\..\..\agg23\font_freetype\agg_font_freetype.h"\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_bitset_iterator.h"\ "..\..\..\agg23\include\agg_clip_liang_barsky.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_conv_curve.h"\ "..\..\..\agg23\include\agg_curves.h"\ "..\..\..\agg23\include\agg_font_cache_manager.h"\ "..\..\..\agg23\include\agg_gamma_functions.h"\ "..\..\..\agg23\include\agg_math.h"\ "..\..\..\agg23\include\agg_path_storage_integer.h"\ "..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\ "..\..\..\agg23\include\agg_render_scanlines.h"\ "..\..\..\agg23\include\agg_renderer_base.h"\ "..\..\..\agg23\include\agg_renderer_scanline.h"\ "..\..\..\agg23\include\agg_rendering_buffer.h"\ "..\..\..\agg23\include\agg_scanline_bin.h"\ "..\..\..\agg23\include\agg_scanline_storage_aa.h"\ "..\..\..\agg23\include\agg_scanline_storage_bin.h"\ "..\..\..\agg23\include\agg_scanline_u.h"\ "..\..\..\agg23\include\agg_trans_affine.h"\ "..\..\..\freetype\include\freetype\config\ftheader.h"\ "..\..\..\freetype\include\ft2build.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_line_aa_basics.cpp DEP_CPP_AGG_L=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_line_aa_basics.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_line_profile_aa.cpp DEP_CPP_AGG_LI=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_dda_line.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_renderer_base.h"\ "..\..\..\agg23\include\agg_renderer_outline_aa.h"\ "..\..\..\agg23\include\agg_rendering_buffer.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_path_storage.cpp DEP_CPP_AGG_P=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_bezier_arc.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_conv_transform.h"\ "..\..\..\agg23\include\agg_math.h"\ "..\..\..\agg23\include\agg_path_storage.h"\ "..\..\..\agg23\include\agg_trans_affine.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_rasterizer_scanline_aa.cpp DEP_CPP_AGG_R=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_clip_liang_barsky.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_gamma_functions.h"\ "..\..\..\agg23\include\agg_math.h"\ "..\..\..\agg23\include\agg_rasterizer_scanline_aa.h"\ "..\..\..\agg23\include\agg_render_scanlines.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_sqrt_tables.cpp DEP_CPP_AGG_S=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_trans_affine.cpp DEP_CPP_AGG_T=\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_trans_affine.h"\ # End Source File # Begin Source File SOURCE=..\..\..\agg23\src\agg_vcgen_stroke.cpp DEP_CPP_AGG_V=\ "..\..\..\agg23\include\agg_array.h"\ "..\..\..\agg23\include\agg_basics.h"\ "..\..\..\agg23\include\agg_config.h"\ "..\..\..\agg23\include\agg_math.h"\ "..\..\..\agg23\include\agg_math_stroke.h"\ "..\..\..\agg23\include\agg_shorten_path.h"\ "..\..\..\agg23\include\agg_vcgen_stroke.h"\ "..\..\..\agg23\include\agg_vertex_sequence.h"\ # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:30:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16013 Added Files: roadmap_canvas.cpp Log Message: WinCE agg implementation. --- NEW FILE: roadmap_canvas.cpp --- /* roadmap_canvas.cpp - manage the canvas that is used to draw the map with agg * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See roadmap_canvas.h. */ #include <windows.h> #define USE_FRIBIDI #ifdef WIN32_PROFILE #include <C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h> #endif #include "agg_rendering_buffer.h" #include "agg_curves.h" #include "agg_conv_stroke.h" #include "agg_conv_contour.h" #include "agg_conv_transform.h" #include "agg_rasterizer_scanline_aa.h" #include "agg_rasterizer_outline_aa.h" #include "agg_rasterizer_outline.h" #include "agg_renderer_primitives.h" #include "agg_ellipse.h" #include "agg_renderer_scanline.h" #include "agg_scanline_p.h" #include "agg_renderer_outline_aa.h" #include "agg_pixfmt_rgb_packed.h" #include "agg_path_storage.h" #include "agg_font_freetype.h" #ifdef USE_FRIBIDI #include <fribidi/fribidi.h> #define MAX_STR_LEN 65000 #endif extern "C" { #include "../roadmap.h" #include "../roadmap_types.h" #include "../roadmap_gui.h" #include "../roadmap_screen.h" #include "../roadmap_canvas.h" #include "../roadmap_messagebox.h" #include "../roadmap_math.h" #include "../roadmap_config.h" #include "../roadmap_path.h" #include "roadmap_wincecanvas.h" #include "colors.h" typedef agg::pixfmt_rgb565 pixfmt; typedef agg::renderer_base<pixfmt> renbase_type; typedef agg::renderer_primitives<renbase_type> renderer_pr; typedef agg::font_engine_freetype_int32 font_engine_type; typedef agg::font_cache_manager<font_engine_type> font_manager_type; static agg::rendering_buffer rbuf; static pixfmt pixf(rbuf); static agg::renderer_base<pixfmt> renb; static agg::line_profile_aa profile(2, agg::gamma_none()); static agg::renderer_outline_aa<renbase_type> reno(renb, profile); static agg::rasterizer_outline_aa< agg::renderer_outline_aa<renbase_type> > raso(reno); static agg::rasterizer_scanline_aa<> ras; static agg::scanline_p8 sl; static agg::renderer_scanline_aa_solid<agg::renderer_base<pixfmt> > ren_solid(renb); static font_engine_type m_feng; static font_manager_type m_fman(m_feng); static RoadMapConfigDescriptor RoadMapConfigFont = ROADMAP_CONFIG_ITEM("Labels", "FontName"); //static agg::conv_curve<font_manager_type::path_adaptor_type> font_curves(m_fman.path_adaptor()); //static agg::conv_stroke<agg::conv_curve<font_manager_type::path_adaptor_type> > font_stroke(font_curves); struct roadmap_canvas_pen { struct roadmap_canvas_pen *next; char *name; COLORREF color; int thickness; }; static struct roadmap_canvas_pen *RoadMapPenList = NULL; static HWND RoadMapDrawingArea; static HDC RoadMapDrawingBuffer; static RoadMapPen CurrentPen; static RECT ClientRect; static HBITMAP OldBitmap = NULL; static int RoadMapCanvasFontLoaded = 0; static void roadmap_canvas_ignore_button (RoadMapGuiPoint *point) {} static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed = roadmap_canvas_ignore_button; static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonReleased = roadmap_canvas_ignore_button; static RoadMapCanvasMouseHandler RoadMapCanvasMouseMove = roadmap_canvas_ignore_button; static void roadmap_canvas_ignore_configure (void) {} static RoadMapCanvasConfigureHandler RoadMapCanvasConfigure = roadmap_canvas_ignore_configure; void roadmap_canvas_get_text_extents (const char *text, int *width, int *ascent, int *descent) { *ascent = 0; *descent = 0; LPWSTR text_unicode = ConvertToWideChar(text, CP_UTF8); double x = 0; double y = 0; const wchar_t* p = text_unicode; while(*p) { const agg::glyph_cache* glyph = m_fman.glyph(*p); if(glyph) { x += glyph->advance_x; y += glyph->advance_y; if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1; } ++p; } *width = (int)x; free(text_unicode); } void roadmap_canvas_select_pen (RoadMapPen pen) { dbg_time_start(DBG_TIME_SELECT_PEN); if (!CurrentPen || (pen->thickness != CurrentPen->thickness)) { profile.width(pen->thickness); } CurrentPen = pen; reno.color(agg::rgba8(GetRValue(pen->color), GetGValue(pen->color), GetBValue(pen->color))); dbg_time_end(DBG_TIME_SELECT_PEN); return; } RoadMapPen roadmap_canvas_create_pen (const char *name) { struct roadmap_canvas_pen *pen; for (pen = RoadMapPenList; pen != NULL; pen = pen->next) { if (strcmp(pen->name, name) == 0) break; } if (pen == NULL) { pen = (struct roadmap_canvas_pen *) malloc (sizeof(struct roadmap_canvas_pen)); roadmap_check_allocated(pen); pen->name = strdup (name); pen->color = RGB(0, 0, 0); pen->thickness = 1; pen->next = RoadMapPenList; RoadMapPenList = pen; } roadmap_canvas_select_pen (pen); return pen; } void roadmap_canvas_set_foreground (const char *color) { int high, i, low; COLORREF c; if (*color == '#') { int r, g, b; sscanf(color, "#%2x%2x%2x", &r, &g, &b); c = RGB(r, g, b); } else { /* Do binary search on color table */ for (low=(-1), high=sizeof(color_table)/sizeof(color_table[0]); high-low > 1;) { i = (high+low) / 2; if (strcmp(color, color_table[i].name) <= 0) high = i; else low = i; } if (!strcmp(color, color_table[high].name)) { c = RGB(color_table[high].r, color_table[high].g, color_table[high].b); } else { c = RGB(0, 0, 0); } } CurrentPen->color = c; roadmap_canvas_select_pen(CurrentPen); } void roadmap_canvas_set_thickness(int thickness) { if (CurrentPen && (CurrentPen->thickness != thickness)) { CurrentPen->thickness = thickness; profile.width(thickness); } roadmap_canvas_select_pen(CurrentPen); } void roadmap_canvas_erase (void) { renb.clear(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); } void roadmap_canvas_draw_string (RoadMapGuiPoint *position, int corner, const char *text) { int x; int y; int text_width; int text_ascent; int text_descent; int text_height; roadmap_canvas_get_text_extents (text, &text_width, &text_ascent, &text_descent); text_height = text_ascent + text_descent; switch (corner) { case ROADMAP_CANVAS_TOPLEFT: y = position->y; x = position->x; break; case ROADMAP_CANVAS_TOPRIGHT: y = position->y; x = position->x - text_width; break; case ROADMAP_CANVAS_BOTTOMRIGHT: y = position->y - text_height; x = position->x - text_width; break; case ROADMAP_CANVAS_BOTTOMLEFT: y = position->y - text_height; x = position->x; break; case ROADMAP_CANVAS_CENTER: y = position->y - (text_height / 2); x = position->x - (text_width / 2); break; default: return; } RoadMapGuiPoint start = {x, y+text_height}; roadmap_canvas_draw_string_angle (&start, position, 0, text); } void roadmap_canvas_draw_multiple_points (int count, RoadMapGuiPoint *points) { int i; for (i=0; i<count; i++) { if (points[i].x < ClientRect.left) continue; else if (points[i].x > ClientRect.right) continue; else if (points[i].y < ClientRect.bottom) continue; else if (points[i].y > ClientRect.top) continue; pixf.copy_pixel(points[i].x, points[i].y, agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); } } void roadmap_canvas_draw_multiple_lines (int count, int *lines, RoadMapGuiPoint *points) { int i; int count_of_points; dbg_time_start(DBG_TIME_DRAW_LINES); #ifdef WIN32_PROFILE ResumeCAPAll(); #endif raso.round_cap(true); raso.accurate_join(true); agg::path_storage path; for (i = 0; i < count; ++i) { int first = 1; count_of_points = *lines; if (count_of_points < 2) continue; dbg_time_start(DBG_TIME_CREATE_PATH); for (int j=0; j<count_of_points; j++) { if (first) { first = 0; path.move_to(points->x, points->y); } else { path.line_to(points->x, points->y); } points++; } dbg_time_end(DBG_TIME_CREATE_PATH); dbg_time_start(DBG_TIME_ADD_PATH); if (roadmap_screen_is_dragging()) { //if (true) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); dbg_time_end(DBG_TIME_ADD_PATH); lines += 1; } #ifdef WIN32_PROFILE SuspendCAPAll(); #endif dbg_time_end(DBG_TIME_DRAW_LINES); } void roadmap_canvas_draw_multiple_polygons (int count, int *polygons, RoadMapGuiPoint *points, int filled) { int i; int count_of_points; agg::path_storage path; for (i = 0; i < count; ++i) { count_of_points = *polygons; int first = 1; for (int j=0; j<count_of_points; j++) { if (first) { first = 0; path.move_to(points->x, points->y); } else { path.line_to(points->x, points->y); } points++; } path.close_polygon(); if (filled) { ras.reset(); ras.add_path(path); ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); agg::render_scanlines( ras, sl, ren_solid); } else if (roadmap_screen_is_dragging()) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); polygons += 1; } } void roadmap_canvas_draw_multiple_circles (int count, RoadMapGuiPoint *centers, int *radius, int filled) { int i; agg::path_storage path; for (i = 0; i < count; ++i) { int r = radius[i]; int x = centers[i].x; int y = centers[i].y; ras.reset (); path.add_path (agg::ellipse( x, y, r, r)); if (filled) { ras.reset(); ras.add_path(path); ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); agg::render_scanlines( ras, sl, ren_solid); } else if (roadmap_screen_is_dragging()) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); } } void roadmap_canvas_register_configure_handler ( RoadMapCanvasConfigureHandler handler) { RoadMapCanvasConfigure = handler; } void roadmap_canvas_button_pressed(POINT *data) { RoadMapGuiPoint point; point.x = (short)data->x; point.y = (short)data->y; (*RoadMapCanvasMouseButtonPressed) (&point); } void roadmap_canvas_button_released(POINT *data) { RoadMapGuiPoint point; point.x = (short)data->x; point.y = (short)data->y; (*RoadMapCanvasMouseButtonReleased) (&point); } void roadmap_canvas_mouse_move(POINT *data) { RoadMapGuiPoint point; point.x = (short)data->x; point.y = (short)data->y; (*RoadMapCanvasMouseMove) (&point); } void roadmap_canvas_register_button_pressed_handler ( RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseButtonPressed = handler; } void roadmap_canvas_register_button_released_handler ( RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseButtonReleased = handler; } void roadmap_canvas_register_mouse_move_handler ( RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseMove = handler; } int roadmap_canvas_width (void) { if (RoadMapDrawingArea == NULL) { return 0; } return ClientRect.right - ClientRect.left + 1; } int roadmap_canvas_height (void) { if (RoadMapDrawingArea == NULL) { return 0; } return ClientRect.bottom - ClientRect.top + 1; } void roadmap_canvas_refresh (void) { HDC hdc; if (RoadMapDrawingArea == NULL) return; dbg_time_start(DBG_TIME_FLIP); hdc = GetDC(RoadMapDrawingArea); BitBlt(hdc, ClientRect.left, ClientRect.top, ClientRect.right - ClientRect.left + 1, ClientRect.bottom - ClientRect.top + 1, RoadMapDrawingBuffer, 0, 0, SRCCOPY); DeleteDC(hdc); dbg_time_end(DBG_TIME_FLIP); } HWND roadmap_canvas_new (HWND hWnd, HWND tool_bar) { HDC hdc; BITMAPINFO bmp_info; HBITMAP bmp; void* buf = 0; if ((RoadMapDrawingBuffer != NULL) && IsWindowVisible(tool_bar)) { DeleteObject(SelectObject(RoadMapDrawingBuffer, OldBitmap)); DeleteDC(RoadMapDrawingBuffer); } hdc = GetDC(RoadMapDrawingArea); RoadMapDrawingArea = hWnd; GetClientRect(hWnd, &ClientRect); if (tool_bar != NULL) { RECT tb_rect; GetClientRect(tool_bar, &tb_rect); ClientRect.top += tb_rect.bottom; } RoadMapDrawingBuffer = CreateCompatibleDC(hdc); bmp_info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmp_info.bmiHeader.biWidth = ClientRect.right - ClientRect.left + 1; bmp_info.bmiHeader.biHeight = ClientRect.bottom - ClientRect.top + 1; bmp_info.bmiHeader.biPlanes = 1; bmp_info.bmiHeader.biBitCount = 16; bmp_info.bmiHeader.biCompression = BI_BITFIELDS; bmp_info.bmiHeader.biSizeImage = 0; bmp_info.bmiHeader.biXPelsPerMeter = 0; bmp_info.bmiHeader.biYPelsPerMeter = 0; bmp_info.bmiHeader.biClrUsed = 0; bmp_info.bmiHeader.biClrImportant = 0; ((DWORD*)bmp_info.bmiColors)[0] = 0xF800; ((DWORD*)bmp_info.bmiColors)[1] = 0x07E0; ((DWORD*)bmp_info.bmiColors)[2] = 0x001F; bmp = CreateDIBSection( RoadMapDrawingBuffer, &bmp_info, DIB_RGB_COLORS, &buf, 0, 0 ); int stride = (((ClientRect.right - ClientRect.left + 1) * 2 + 3) >> 2) << 2; rbuf.attach((unsigned char*)buf, ClientRect.right - ClientRect.left + 1, ClientRect.bottom - ClientRect.top + 1, -stride); renb.attach(pixf); ras.clip_box(0, 0, renb.width(), renb.height()); agg::glyph_rendering gren = gren = agg::glyph_ren_outline; roadmap_config_declare ("preferences", &RoadMapConfigFont, "font.ttf"); char font_file[255]; snprintf(font_file, sizeof(font_file), "%s\\%s", roadmap_path_user(), roadmap_config_get (&RoadMapConfigFont)); if (!RoadMapCanvasFontLoaded) { if(m_feng.load_font(font_file, 0, gren)) { m_feng.hinting(true); m_feng.height(15); m_feng.width(15); m_feng.flip_y(true); RoadMapCanvasFontLoaded = 1; } else { RoadMapCanvasFontLoaded = -1; char message[300]; snprintf(message, sizeof(message), "Can't load font: %s\n", font_file); roadmap_messagebox("Error", message); } } OldBitmap = (HBITMAP)SelectObject(RoadMapDrawingBuffer, bmp); DeleteDC(hdc); (*RoadMapCanvasConfigure) (); return RoadMapDrawingArea; } void roadmap_canvas_save_screenshot (const char* filename) { /* NOT IMPLEMENTED. */ } } /* ** Use FRIBIDI to encode the string. ** The return value must be freed by the caller. */ #ifdef USE_FRIBIDI static wchar_t* bidi_string(FriBidiChar *logical) { FriBidiCharType base = FRIBIDI_TYPE_ON; size_t len; len = wcslen(logical); FriBidiChar *visual; FriBidiStrIndex *ltov, *vtol; FriBidiLevel *levels; FriBidiStrIndex new_len; fribidi_boolean log2vis; visual = (FriBidiChar *) malloc (sizeof (FriBidiChar) * (len + 1)); ltov = NULL; vtol = NULL; levels = NULL; /* Create a bidi string. */ log2vis = fribidi_log2vis (logical, len, &base, /* output */ visual, ltov, vtol, levels); if (!log2vis) { //msSetError(MS_IDENTERR, "Failed to create bidi string.", //"msGetFriBidiEncodedString()"); return NULL; } new_len = len; return visual; } #endif void roadmap_canvas_draw_string_angle (RoadMapGuiPoint *position, RoadMapGuiPoint *center, int angle, const char *text) { if (roadmap_screen_is_dragging()) return; if (RoadMapCanvasFontLoaded != 1) return; dbg_time_start(DBG_TIME_TEXT_FULL); dbg_time_start(DBG_TIME_TEXT_CNV); LPWSTR text_unicode = ConvertToWideChar(text, CP_UTF8); ren_solid.color(agg::rgba8(0, 0, 0)); #ifdef USE_FRIBIDI LPWSTR logical = text_unicode; text_unicode = bidi_string(logical); free(logical); #endif dbg_time_end(DBG_TIME_TEXT_CNV); dbg_time_start(DBG_TIME_TEXT_LOAD); double x = 0; double y = 0; const wchar_t* p = text_unicode; dbg_time_end(DBG_TIME_TEXT_LOAD); while(*p) { dbg_time_start(DBG_TIME_TEXT_ONE_LETTER); dbg_time_start(DBG_TIME_TEXT_GET_GLYPH); const agg::glyph_cache* glyph = m_fman.glyph(*p); dbg_time_end(DBG_TIME_TEXT_GET_GLYPH); if(glyph) { m_fman.init_embedded_adaptors(glyph, x, y); //agg::conv_curve<font_manager_type::path_adaptor_type> stroke(m_fman.path_adaptor()); agg::trans_affine mtx; mtx *= agg::trans_affine_rotation(agg::deg2rad(angle)); mtx *= agg::trans_affine_translation(position->x, position->y); agg::conv_transform<font_manager_type::path_adaptor_type> tr(m_fman.path_adaptor(), mtx); agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > fill(tr); //agg::conv_stroke< //agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > > //stroke(fill); agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > stroke(tr); dbg_time_start(DBG_TIME_TEXT_ONE_RAS); #ifdef WIN32_PROFILE ResumeCAPAll(); #endif ras.add_path(tr); agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(fill); //ren_solid.color(agg::rgba8(0, 0, 0)); //agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(stroke); //ren_solid.color(agg::rgba8(255, 255, 255)); //agg::render_scanlines(ras, sl, ren_solid); #ifdef WIN32_PROFILE SuspendCAPAll(); #endif dbg_time_end(DBG_TIME_TEXT_ONE_RAS); // increment pen position x += glyph->advance_x; y += glyph->advance_y; dbg_time_end(DBG_TIME_TEXT_ONE_LETTER); } ++p; } free(text_unicode); dbg_time_end(DBG_TIME_TEXT_FULL); } |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:28:43
|
Update of /cvsroot/roadmap/roadmap_editor/src/gtk2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14509 Modified Files: Makefile Added Files: roadmap_canvas_agg.cpp Log Message: Change gtk2 build to use agg. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 22 Mar 2006 08:52:52 -0000 1.4 --- Makefile 23 Apr 2006 13:28:39 -0000 1.5 *************** *** 17,21 **** WARNFLAGS = -W -Wall -Wno-unused-parameter ! RDMLIBS= ../libroadmap.a libgtkroadmap.a ../unix/libosroadmap.a ../libroadmap.a --- 17,21 ---- WARNFLAGS = -W -Wall -Wno-unused-parameter ! RDMLIBS= ../libroadmap.a libgtkroadmap.a ../libguiroadmap.a ../unix/libosroadmap.a ../libroadmap.a libgtkroadmap.a *************** *** 49,54 **** CFLAGS = $(STDCFLAGS) $(GPECFLAGS) $(GUICFLAGS) -I.. -I/usr/local/include -DNDEBUG ! LIBS = -L/usr/local/lib $(RDMLIBS) $(GPELDFLAGS) $(GUILDFLAGS) -lm -L ../dglib -ldgl # --- RoadMap sources & targets ----------------------------------- --- 49,60 ---- CFLAGS = $(STDCFLAGS) $(GPECFLAGS) $(GUICFLAGS) -I.. -I/usr/local/include -DNDEBUG ! LIBS = -L/usr/local/lib $(RDMLIBS) $(GPELDFLAGS) $(GUILDFLAGS) -lm -L ../dglib -ldgl -lagg -lfreetype ! ! ifeq ($(BIDI),YES) ! LIBS += -lfribidi ! CFLAGS += -DUSE_FRIBIDI ! endif + CXXFLAGS = $(CFLAGS) -I/usr/include/agg2 -I/usr/include/freetype2 -I/usr/include/fribidi # --- RoadMap sources & targets ----------------------------------- *************** *** 56,63 **** roadmap_messagebox.c \ roadmap_dialog.c \ ! roadmap_fileselection.c \ ! roadmap_canvas.c ! RMLIBOBJS=$(RMLIBSRCS:.c=.o) RUNTIME=gtkroadgps gtkroadmap --- 62,68 ---- roadmap_messagebox.c \ roadmap_dialog.c \ ! roadmap_fileselection.c ! RMLIBOBJS=$(RMLIBSRCS:.c=.o) roadmap_canvas_agg.o ../agg23/font_freetype/agg_font_freetype.o RUNTIME=gtkroadgps gtkroadmap *************** *** 106,110 **** gtkroadmap: roadmap_main.o ../libguiroadmap.a $(RDMLIBS) ! $(CC) $(LDFLAGS) roadmap_main.o -o gtkroadmap ../libguiroadmap.a $(LIBS) gtkroadgps: roadmap_main.o ../libguiroadgps.a $(RDMLIBS) --- 111,115 ---- gtkroadmap: roadmap_main.o ../libguiroadmap.a $(RDMLIBS) ! $(CXX) $(LDFLAGS) roadmap_main.o -o gtkroadmap ../libguiroadmap.a $(LIBS) gtkroadgps: roadmap_main.o ../libguiroadgps.a $(RDMLIBS) --- NEW FILE: roadmap_canvas_agg.cpp --- /* roadmap_canvas.c - manage the canvas that is used to draw the map. * * LICENSE: * * Copyright 2002 Pascal F. Martin * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See roadmap_canvas.h. */ #include <math.h> #include <stdio.h> #include <string.h> #include <stdlib.h> #include <wchar.h> #include <agg_rendering_buffer.h> #include <agg_curves.h> #include <agg_conv_stroke.h> #include <agg_conv_contour.h> #include <agg_conv_transform.h> #include <agg_rasterizer_scanline_aa.h> #include <agg_rasterizer_outline_aa.h> #include <agg_rasterizer_outline.h> #include <agg_renderer_primitives.h> #include <agg_ellipse.h> #include <agg_renderer_scanline.h> #include <agg_scanline_p.h> #include <agg_renderer_outline_aa.h> #include <agg_pixfmt_rgb_packed.h> #include <agg_path_storage.h> #include <agg_font_freetype.h> #ifdef USE_FRIBIDI #include <fribidi.h> #define MAX_STR_LEN 65000 #endif extern "C" { #include "roadmap.h" #include "roadmap_types.h" #include "roadmap_gui.h" #include "roadmap_config.h" #include "roadmap_messagebox.h" #include "roadmap_screen.h" #include "roadmap_path.h" #include "roadmap_canvas.h" #include "roadmap_gtkcanvas.h" } #define ROADMAP_CURSOR_SIZE 10 #define ROADMAP_CANVAS_POINT_BLOCK 1024 #define GetRValue(x) x.red #define GetGValue(x) x.green #define GetBValue(x) x.blue typedef agg::pixfmt_rgb565 pixfmt; typedef agg::renderer_base<pixfmt> renbase_type; typedef agg::renderer_primitives<renbase_type> renderer_pr; typedef agg::font_engine_freetype_int32 font_engine_type; typedef agg::font_cache_manager<font_engine_type> font_manager_type; static agg::rendering_buffer rbuf; static pixfmt pixf(rbuf); static agg::renderer_base<pixfmt> renb; static agg::line_profile_aa profile(2, agg::gamma_none()); static agg::renderer_outline_aa<renbase_type> reno(renb, profile); static agg::rasterizer_outline_aa< agg::renderer_outline_aa<renbase_type> > raso(reno); static agg::rasterizer_scanline_aa<> ras; static agg::scanline_p8 sl; static agg::renderer_scanline_aa_solid<agg::renderer_base<pixfmt> > ren_solid(renb); static font_engine_type m_feng; static font_manager_type m_fman(m_feng); static RoadMapConfigDescriptor RoadMapConfigFont = ROADMAP_CONFIG_ITEM("Labels", "FontName"); struct roadmap_canvas_pen { struct roadmap_canvas_pen *next; char *name; GdkGC *gc; GdkColor color; int thickness; }; static struct roadmap_canvas_pen *RoadMapPenList = NULL; static GtkWidget *RoadMapDrawingArea; static GdkImage *RoadMapDrawingBuffer; static RoadMapPen CurrentPen; static int RoadMapCanvasFontLoaded = 0; /* The canvas callbacks: all callbacks are initialized to do-nothing * functions, so that we don't care checking if one has been setup. */ static void roadmap_canvas_ignore_mouse (RoadMapGuiPoint *point) {} static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonPressed = roadmap_canvas_ignore_mouse; static RoadMapCanvasMouseHandler RoadMapCanvasMouseButtonReleased = roadmap_canvas_ignore_mouse; static RoadMapCanvasMouseHandler RoadMapCanvasMouseMoved = roadmap_canvas_ignore_mouse; static void roadmap_canvas_ignore_configure (void) {} static RoadMapCanvasConfigureHandler RoadMapCanvasConfigure = roadmap_canvas_ignore_configure; void roadmap_canvas_get_text_extents (const char *text, int *width, int *ascent, int *descent) { *ascent = 0; *descent = 0; wchar_t wstr[255]; int length = mbstowcs(wstr, text, 254); if (length <=0) { *width = 0; return; } wstr[length] = 0; double x = 0; double y = 0; const wchar_t* p = wstr; while(*p) { const agg::glyph_cache* glyph = m_fman.glyph(*p); if(glyph) { x += glyph->advance_x; y += glyph->advance_y; //if (glyph->bounds.y2 < *ascent) *ascent=glyph->bounds.y2; if (-glyph->bounds.y1 > *descent) *descent=-glyph->bounds.y1 - 1; } ++p; } *width = (int)x; } void roadmap_canvas_select_pen (RoadMapPen pen) { if (!CurrentPen || (pen->thickness != CurrentPen->thickness)) { profile.width(pen->thickness); } CurrentPen = pen; reno.color(agg::rgba8(GetRValue(pen->color), GetGValue(pen->color), GetBValue(pen->color))); } RoadMapPen roadmap_canvas_create_pen (const char *name) { struct roadmap_canvas_pen *pen; for (pen = RoadMapPenList; pen != NULL; pen = pen->next) { if (strcmp(pen->name, name) == 0) break; } if (pen == NULL) { /* This is a new pen: create it. */ pen = (struct roadmap_canvas_pen *) malloc (sizeof(struct roadmap_canvas_pen)); roadmap_check_allocated(pen); pen->name = strdup (name); pen->next = RoadMapPenList; pen->thickness = 1; RoadMapPenList = pen; } roadmap_canvas_select_pen (pen); return pen; } void roadmap_canvas_set_foreground (const char *color) { GdkColor *native_color; native_color = (GdkColor *) g_malloc (sizeof(GdkColor)); gdk_color_parse (color, native_color); gdk_color_alloc (gdk_colormap_get_system(), native_color); CurrentPen->color = *native_color; roadmap_canvas_select_pen(CurrentPen); } void roadmap_canvas_set_thickness (int thickness) { if (CurrentPen && (CurrentPen->thickness != thickness)) { CurrentPen->thickness = thickness; profile.width(thickness); } } void roadmap_canvas_erase (void) { renb.clear(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); } void roadmap_canvas_draw_string (RoadMapGuiPoint *position, int corner, const char *text) { int x; int y; int text_width; int text_ascent; int text_descent; int text_height; roadmap_canvas_get_text_extents (text, &text_width, &text_ascent, &text_descent); text_height = text_ascent + text_descent; switch (corner) { case ROADMAP_CANVAS_TOPLEFT: y = position->y; x = position->x; break; case ROADMAP_CANVAS_TOPRIGHT: y = position->y; x = position->x - text_width; break; case ROADMAP_CANVAS_BOTTOMRIGHT: y = position->y - text_height; x = position->x - text_width; break; case ROADMAP_CANVAS_BOTTOMLEFT: y = position->y - text_height; x = position->x; break; case ROADMAP_CANVAS_CENTER: y = position->y - (text_height / 2); x = position->x - (text_width / 2); break; default: return; } RoadMapGuiPoint start = {x, y+text_height}; roadmap_canvas_draw_string_angle (&start, position, 0, text); } void roadmap_canvas_draw_multiple_points (int count, RoadMapGuiPoint *points) { int i; for (i=0; i<count; i++) { if (points[i].x < 0) continue; else if (points[i].x >= roadmap_canvas_width()) continue; else if (points[i].y < 0) continue; else if (points[i].y >= roadmap_canvas_height()) continue; pixf.copy_pixel(points[i].x, points[i].y, agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); } } void roadmap_canvas_draw_multiple_lines (int count, int *lines, RoadMapGuiPoint *points) { int i; int count_of_points; raso.round_cap(true); raso.accurate_join(true); agg::path_storage path; for (i = 0; i < count; ++i) { int first = 1; count_of_points = *lines; if (count_of_points < 2) continue; for (int j=0; j<count_of_points; j++) { if (first) { first = 0; path.move_to(points->x, points->y); } else { path.line_to(points->x, points->y); } points++; } if (roadmap_screen_is_dragging()) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); lines += 1; } } void roadmap_canvas_draw_multiple_polygons (int count, int *polygons, RoadMapGuiPoint *points, int filled) { int i; int count_of_points; agg::path_storage path; for (i = 0; i < count; ++i) { count_of_points = *polygons; int first = 1; for (int j=0; j<count_of_points; j++) { if (first) { first = 0; path.move_to(points->x, points->y); } else { path.line_to(points->x, points->y); } points++; } path.close_polygon(); if (filled) { ras.reset(); ras.add_path(path); ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); agg::render_scanlines( ras, sl, ren_solid); } else if (roadmap_screen_is_dragging()) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); polygons += 1; } } void roadmap_canvas_draw_multiple_circles (int count, RoadMapGuiPoint *centers, int *radius, int filled) { int i; agg::path_storage path; for (i = 0; i < count; ++i) { int r = radius[i]; int x = centers[i].x; int y = centers[i].y; ras.reset (); agg::ellipse e( x, y, r, r); path.add_path(e); if (filled) { ras.reset(); ras.add_path(path); ren_solid.color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); agg::render_scanlines( ras, sl, ren_solid); } else if (roadmap_screen_is_dragging()) { renderer_pr ren_pr(renb); agg::rasterizer_outline<renderer_pr> ras_line(ren_pr); ren_pr.line_color(agg::rgba8(GetRValue(CurrentPen->color), GetGValue(CurrentPen->color), GetBValue(CurrentPen->color))); ras_line.add_path(path); } else { raso.add_path(path); } path.remove_all (); } } static gint roadmap_canvas_configure (GtkWidget *widget, GdkEventConfigure *event) { static GdkPixmap *tmp_buf; if (tmp_buf != NULL) { gdk_pixmap_unref (tmp_buf); } tmp_buf = gdk_pixmap_new (widget->window, widget->allocation.width, widget->allocation.height, -1); if (RoadMapDrawingBuffer != NULL) { gdk_image_unref (RoadMapDrawingBuffer); } RoadMapDrawingBuffer = gdk_drawable_get_image (tmp_buf, 0, 0, widget->allocation.width, widget->allocation.height); if (RoadMapDrawingBuffer->visual->type != GDK_VISUAL_TRUE_COLOR) { exit(-1); } rbuf.attach((unsigned char*)RoadMapDrawingBuffer->mem, RoadMapDrawingBuffer->width, RoadMapDrawingBuffer->height, RoadMapDrawingBuffer->bpl); renb.attach(pixf); ras.clip_box(0, 0, renb.width(), renb.height()); agg::glyph_rendering gren = gren = agg::glyph_ren_outline; roadmap_config_declare ("preferences", &RoadMapConfigFont, "font.ttf"); char font_file[255]; snprintf(font_file, sizeof(font_file), "%s/%s", roadmap_path_user(), roadmap_config_get (&RoadMapConfigFont)); if (!RoadMapCanvasFontLoaded) { if(m_feng.load_font(font_file, 0, gren)) { m_feng.hinting(true); m_feng.height(15); m_feng.width(15); m_feng.flip_y(true); RoadMapCanvasFontLoaded = 1; } else { RoadMapCanvasFontLoaded = -1; char message[300]; snprintf(message, sizeof(message), "Can't load font: %s\n", font_file); roadmap_messagebox("Error", message); } } (*RoadMapCanvasConfigure) (); return TRUE; } void roadmap_canvas_register_configure_handler (RoadMapCanvasConfigureHandler handler) { RoadMapCanvasConfigure = handler; } static gint roadmap_canvas_expose (GtkWidget *widget, GdkEventExpose *event) { gdk_draw_image (widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], RoadMapDrawingBuffer, event->area.x, event->area.y, event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; } static gint roadmap_canvas_mouse_event (GtkWidget *w, GdkEventButton *event, gpointer data) { RoadMapGuiPoint point; point.x = (short)event->x; point.y = (short)event->y; switch ((int) data) { case 1: (*RoadMapCanvasMouseButtonPressed) (&point); break; case 2: (*RoadMapCanvasMouseButtonReleased) (&point); break; case 3: (*RoadMapCanvasMouseMoved) (&point); break; } return FALSE; } void roadmap_canvas_register_button_pressed_handler (RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseButtonPressed = handler; } void roadmap_canvas_register_button_released_handler (RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseButtonReleased = handler; } void roadmap_canvas_register_mouse_move_handler (RoadMapCanvasMouseHandler handler) { RoadMapCanvasMouseMoved = handler; } int roadmap_canvas_width (void) { if (RoadMapDrawingArea == NULL) { return 0; } return RoadMapDrawingArea->allocation.width; } int roadmap_canvas_height (void) { if (RoadMapDrawingArea == NULL) { return 0; } return RoadMapDrawingArea->allocation.height; } void roadmap_canvas_refresh (void) { GdkRectangle update; update.x = 0; update.y = 0; update.width = RoadMapDrawingArea->allocation.width; update.height = RoadMapDrawingArea->allocation.height; gtk_widget_queue_draw_area (RoadMapDrawingArea, 0, 0, RoadMapDrawingArea->allocation.width, RoadMapDrawingArea->allocation.height); } GtkWidget *roadmap_canvas_new (void) { RoadMapDrawingArea = gtk_drawing_area_new (); gtk_widget_set_double_buffered (RoadMapDrawingArea, FALSE); gtk_widget_set_events (RoadMapDrawingArea, GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK); g_signal_connect (RoadMapDrawingArea, "expose_event", (GCallback) roadmap_canvas_expose, NULL); g_signal_connect (RoadMapDrawingArea, "configure_event", (GCallback) roadmap_canvas_configure, NULL); g_signal_connect (RoadMapDrawingArea, "button_press_event", (GCallback) roadmap_canvas_mouse_event, (gpointer)1); g_signal_connect (RoadMapDrawingArea, "button_release_event", (GCallback) roadmap_canvas_mouse_event, (gpointer)2); g_signal_connect (RoadMapDrawingArea, "motion_notify_event", (GCallback) roadmap_canvas_mouse_event, (gpointer)3); //RoadMapGc = RoadMapDrawingArea->style->black_gc; return RoadMapDrawingArea; } void roadmap_canvas_save_screenshot (const char* filename) { #if 0 gint width,height; GdkColormap *colormap = gdk_colormap_get_system(); GdkPixbuf *pixbuf; GError *error = NULL; gdk_drawable_get_size(RoadMapDrawingBuffer, &width, &height); pixbuf = gdk_pixbuf_get_from_drawable(NULL, // Create a new pixbuf. RoadMapDrawingBuffer, colormap, 0,0, // source 0,0, // destination width, height); // size if (gdk_pixbuf_save(pixbuf, filename, "png", &error, NULL) == FALSE) { roadmap_log(ROADMAP_ERROR, "Failed to save image %s\n",filename); } gdk_pixbuf_unref(pixbuf); #endif } /* ** Use FRIBIDI to encode the string. ** The return value must be freed by the caller. */ #ifdef USE_FRIBIDI static wchar_t* bidi_string(wchar_t *logical) { FriBidiCharType base = FRIBIDI_TYPE_ON; size_t len; len = wcslen(logical); FriBidiChar *visual; FriBidiStrIndex *ltov, *vtol; FriBidiLevel *levels; FriBidiStrIndex new_len; fribidi_boolean log2vis; visual = (FriBidiChar *) malloc (sizeof (FriBidiChar) * (len + 1)); ltov = NULL; vtol = NULL; levels = NULL; /* Create a bidi string. */ log2vis = fribidi_log2vis ((FriBidiChar *)logical, len, &base, /* output */ visual, ltov, vtol, levels); if (!log2vis) { //msSetError(MS_IDENTERR, "Failed to create bidi string.", //"msGetFriBidiEncodedString()"); return NULL; } new_len = len; return (wchar_t *)visual; } #endif void roadmap_canvas_draw_string_angle (RoadMapGuiPoint *position, RoadMapGuiPoint *center, int angle, const char *text) { if (roadmap_screen_is_dragging()) return; if (RoadMapCanvasFontLoaded != 1) return; ren_solid.color(agg::rgba8(0, 0, 0)); double x = 0; double y = 0; wchar_t wstr[255]; //mbstate_t ps; //int length = mbrtowc(wstr, text, 10, mbstate_t *ps); int length = mbstowcs(wstr, text, 254); if (length <=0) return; wstr[length] = 0; #ifdef USE_FRIBIDI wchar_t *bidi_text = bidi_string(wstr); const wchar_t* p = bidi_text; #else const wchar_t* p = wstr; #endif while(*p) { const agg::glyph_cache* glyph = m_fman.glyph(*p); if(glyph) { m_fman.init_embedded_adaptors(glyph, x, y); //agg::conv_curve<font_manager_type::path_adaptor_type> stroke(m_fman.path_adaptor()); agg::trans_affine mtx; if (abs(angle) > 5) { mtx *= agg::trans_affine_rotation(agg::deg2rad(angle)); } mtx *= agg::trans_affine_translation(position->x, position->y); agg::conv_transform<font_manager_type::path_adaptor_type> tr(m_fman.path_adaptor(), mtx); agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > fill(tr); //agg::conv_stroke< //agg::conv_curve<agg::conv_transform<font_manager_type::path_adaptor_type> > > //stroke(fill); agg::conv_stroke< agg::conv_transform<font_manager_type::path_adaptor_type> > stroke(tr); ras.add_path(tr); //ren_solid.color(agg::rgba8(0, 0, 0)); agg::render_scanlines(ras, sl, ren_solid); //ras.add_path(stroke); //ren_solid.color(agg::rgba8(255, 255, 255)); //agg::render_scanlines(ras, sl, ren_solid); // increment pen position x += glyph->advance_x; y += glyph->advance_y; } ++p; } #ifdef USE_FRIBIDI free(bidi_text); #endif } |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:27:13
|
Update of /cvsroot/roadmap/roadmap_editor/src/fribidi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13520 Modified Files: fribidi.h Log Message: Protect from Linux inclusion. Index: fribidi.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/fribidi/fribidi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fribidi.h 21 Apr 2006 16:35:05 -0000 1.1 --- fribidi.h 23 Apr 2006 13:27:11 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- #define FRIBIDI_H + #ifndef WIN32 + #error This is the win32 include file. It will not work on Unix. + #endif #ifndef NULL #define NULL 0 |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:26:09
|
Update of /cvsroot/roadmap/roadmap_editor/src/freetype/include/freetype/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12554 Modified Files: ftmodule.h ftoption.h Log Message: Add sfnt module. Index: ftoption.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/freetype/include/freetype/config/ftoption.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ftoption.h 21 Apr 2006 16:22:32 -0000 1.1 --- ftoption.h 23 Apr 2006 13:26:00 -0000 1.2 *************** *** 370,374 **** /* TrueType & OpenType). */ /* */ ! /* #define TT_CONFIG_OPTION_EMBEDDED_BITMAPS */ --- 370,374 ---- /* TrueType & OpenType). */ /* */ ! #define TT_CONFIG_OPTION_EMBEDDED_BITMAPS Index: ftmodule.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/freetype/include/freetype/config/ftmodule.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ftmodule.h 21 Apr 2006 16:22:32 -0000 1.1 --- ftmodule.h 23 Apr 2006 13:26:00 -0000 1.2 *************** *** 12,16 **** FT_USE_MODULE(pshinter_module_class) //FT_USE_MODULE(ft_raster1_renderer_class) ! //FT_USE_MODULE(sfnt_module_class) //FT_USE_MODULE(ft_smooth_renderer_class) //FT_USE_MODULE(ft_smooth_lcd_renderer_class) --- 12,16 ---- FT_USE_MODULE(pshinter_module_class) //FT_USE_MODULE(ft_raster1_renderer_class) ! FT_USE_MODULE(sfnt_module_class) //FT_USE_MODULE(ft_smooth_renderer_class) //FT_USE_MODULE(ft_smooth_lcd_renderer_class) |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:24:49
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/track In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11764 Modified Files: editor_track_main.c Log Message: Label support. Index: editor_track_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** editor_track_main.c 17 Mar 2006 09:56:00 -0000 1.10 --- editor_track_main.c 23 Apr 2006 13:24:39 -0000 1.11 *************** *** 625,629 **** roadmap_screen_draw_one_line (from, to, 0, from, first_shape, last_shape, ! editor_track_shape_position, pen); return 1; --- 625,629 ---- roadmap_screen_draw_one_line (from, to, 0, from, first_shape, last_shape, ! editor_track_shape_position, pen, 0, 0 ,0); return 1; |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:23:51
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11225 Modified Files: editor_export.c Log Message: Fix reset dirty. Index: editor_export.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_export.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** editor_export.c 17 Mar 2006 09:53:38 -0000 1.8 --- editor_export.c 23 Apr 2006 13:23:47 -0000 1.9 *************** *** 39,43 **** #include "roadmap_locator.h" #include "roadmap_line_route.h" ! #include "roadmap_fileselection.h" #include "roadmap_messagebox.h" --- 39,43 ---- #include "roadmap_locator.h" #include "roadmap_line_route.h" ! #include "roadmap_fileselection.h" #include "roadmap_messagebox.h" *************** *** 378,382 **** if (file == NULL) { ! editor_log (ROADMAP_ERROR, "Can't create file: %s", name); roadmap_messagebox ("Export Error", "Can't create file."); return -1; --- 378,382 ---- if (file == NULL) { ! editor_log (ROADMAP_ERROR, "Can't create file: %s", name); roadmap_messagebox ("Export Error", "Can't create file."); return -1; *************** *** 386,392 **** if (fips < 0) { ! editor_log (ROADMAP_ERROR, "Can't locate current fips"); ! close_export_file (file); ! roadmap_file_remove (NULL, name); roadmap_messagebox ("Export Error", "Can't locate fips."); return -1; --- 386,392 ---- if (fips < 0) { ! editor_log (ROADMAP_ERROR, "Can't locate current fips"); ! close_export_file (file); ! roadmap_file_remove (NULL, name); roadmap_messagebox ("Export Error", "Can't locate fips."); return -1; *************** *** 394,401 **** if (editor_db_activate (fips) == -1) { ! editor_log (ROADMAP_ERROR, "Can't load editor db"); ! close_export_file (file); ! roadmap_file_remove (NULL, name); ! roadmap_messagebox ("Export Error", "No editor data to export."); return -1; } --- 394,401 ---- if (editor_db_activate (fips) == -1) { ! editor_log (ROADMAP_ERROR, "Can't load editor db"); ! close_export_file (file); ! roadmap_file_remove (NULL, name); ! roadmap_messagebox ("Export Error", "No editor data to export."); return -1; } *************** *** 408,415 **** if (!export_dirty_lines (file)) { ! editor_log (ROADMAP_INFO, "No trksegs are available for export."); ! roadmap_messagebox ("Export Error", "No new data to export."); ! close_export_file (file); ! roadmap_file_remove (NULL, name); return 0; } --- 408,415 ---- if (!export_dirty_lines (file)) { ! editor_log (ROADMAP_INFO, "No trksegs are available for export."); ! roadmap_messagebox ("Export Error", "No new data to export."); ! close_export_file (file); ! roadmap_file_remove (NULL, name); return 0; } *************** *** 529,532 **** --- 529,551 ---- int i; + count = editor_trkseg_get_current_trkseg (); + + for (i=0; i<count; i++) { + int trkseg_flags; + + editor_trkseg_get + (i, NULL, NULL, NULL, &trkseg_flags); + + if (!(trkseg_flags & ED_TRKSEG_FAKE)) { + editor_trkseg_set_next_export (i); + break; + } + } + + if (i == count) { + roadmap_messagebox ("Error", "Can't find first trkseg to export."); + return; + } + count = editor_line_get_count (); *************** *** 537,542 **** editor_line_get (i, NULL, NULL, NULL, &cfcc, &flags); ! editor_line_modify_properties (i, cfcc, flags | ED_LINE_DIRTY); } } --- 556,562 ---- editor_line_get (i, NULL, NULL, NULL, &cfcc, &flags); ! /* editor_line_modify_properties (i, cfcc, flags | ED_LINE_DIRTY); */ } + } |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:22:54
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10526 Modified Files: editor_trkseg.c editor_trkseg.h Log Message: Add next trkseg controller. Index: editor_trkseg.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_trkseg.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editor_trkseg.c 17 Dec 2005 21:58:44 -0000 1.4 --- editor_trkseg.c 23 Apr 2006 13:22:43 -0000 1.5 *************** *** 521,522 **** --- 521,527 ---- } + void editor_trkseg_set_next_export (int id) { + + ActiveTrksegDB->header.next_export = id; + } + Index: editor_trkseg.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/db/editor_trkseg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** editor_trkseg.h 17 Dec 2005 21:58:44 -0000 1.2 --- editor_trkseg.h 23 Apr 2006 13:22:44 -0000 1.3 *************** *** 101,104 **** --- 101,105 ---- void editor_trkseg_reset_next_export (void); int editor_trkseg_get_next_export (void); + void editor_trkseg_set_next_export (int id); extern roadmap_db_handler EditorTrksegHandler; |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:21:21
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9734 Modified Files: editor_plugin.c Log Message: Label support. Index: editor_plugin.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_plugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editor_plugin.c 17 Dec 2005 21:58:09 -0000 1.4 --- editor_plugin.c 23 Apr 2006 13:21:18 -0000 1.5 *************** *** 118,121 **** --- 118,123 ---- props->city = editor_street_get_street_city (&properties, ED_STREET_LEFT_SIDE); + props->plugin_street.plugin_id = line->plugin_id; + props->plugin_street.street_id = properties.street; } |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:16:52
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6668 Modified Files: roadmap_gui.h Log Message: Label support. Index: roadmap_gui.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_gui.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadmap_gui.h 15 Oct 2005 22:19:00 -0000 1.1.1.1 --- roadmap_gui.h 23 Apr 2006 13:16:48 -0000 1.2 *************** *** 35,38 **** --- 35,47 ---- } RoadMapGuiPoint; + typedef struct { + + short minx; + short miny; + short maxx; + short maxy; + + } RoadMapGuiRect; + #endif /* _ROADMAP_GUI__H_ */ |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:15:27
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5903 Modified Files: roadmap_label.c roadmap_label.h Log Message: Label support. Index: roadmap_label.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_label.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_label.c 21 Apr 2006 17:18:52 -0000 1.1 --- roadmap_label.c 23 Apr 2006 13:15:21 -0000 1.2 *************** *** 77,81 **** RoadMapGuiPoint poly[4]; int w, h; ! int buffer = 0; int lines = 2; --- 77,81 ---- RoadMapGuiPoint poly[4]; int w, h; ! int buffer = 0; int lines = 2; *************** *** 88,92 **** q.x = x1 - rect->minx; ! q.y = rect->maxy - y1; roadmap_math_rotate_point (&q, p, angle); --- 88,92 ---- q.x = x1 - rect->minx; ! q.y = rect->miny - y1; roadmap_math_rotate_point (&q, p, angle); *************** *** 99,103 **** poly[1].y = -(y1 -h - buffer); roadmap_math_rotate_point (&poly[1], p, angle); ! poly[2].x = x1 + w + buffer; /* ur */ poly[2].y = -(y1 -h - buffer); --- 99,103 ---- poly[1].y = -(y1 -h - buffer); roadmap_math_rotate_point (&poly[1], p, angle); ! poly[2].x = x1 + w + buffer; /* ur */ poly[2].y = -(y1 -h - buffer); *************** *** 107,114 **** poly[3].y = -(y1 + buffer); roadmap_math_rotate_point (&poly[3], p, angle); ! ! lines = 4; ! ! //roadmap_canvas_draw_multiple_lines(1, &lines, poly); compute_bbox(poly, bbox); --- 107,114 ---- poly[3].y = -(y1 + buffer); roadmap_math_rotate_point (&poly[3], p, angle); ! ! lines = 4; ! ! /* roadmap_canvas_draw_multiple_lines(1, &lines, poly); */ compute_bbox(poly, bbox); *************** *** 122,127 **** labelCacheMemberObj *cachePtr; ! ! if (RoadMapLabelCacheFull) return -1; if (featuresize < --- 122,127 ---- labelCacheMemberObj *cachePtr; ! ! if (RoadMapLabelCacheFull) return -1; if (featuresize < *************** *** 132,136 **** if(RoadMapLabelCache.numlabels == MAX_LABELS) { ! roadmap_log (ROADMAP_ERROR, "Too many lables on screen."); RoadMapLabelCacheFull = 1; return -1; --- 132,136 ---- if(RoadMapLabelCache.numlabels == MAX_LABELS) { ! roadmap_log (ROADMAP_WARNING, "Too many lables on screen."); RoadMapLabelCacheFull = 1; return -1; *************** *** 183,191 **** roadmap_canvas_get_text_extents(text, &width, &ascent, &descent); r.minx = 0; ! r.maxx=width; ! r.miny = -ascent; ! r.maxy = descent; ! //FIXME ! width *= 1.5; /* --- 183,189 ---- roadmap_canvas_get_text_extents(text, &width, &ascent, &descent); r.minx = 0; ! r.maxx=width+1; ! r.miny = ascent; ! r.maxy = descent+1; /* *************** *** 200,215 **** cachePtr->status = 1; /* assume label *can* be drawn */ ! ! /* The stored point is not screen orieneted, rotate is needed */ ! roadmap_math_rotate_coordinates (1, &cachePtr->point); ! cachePtr->angle += roadmap_math_get_orientation (); ! ! while (cachePtr->angle > 360) cachePtr->angle -= 360; ! while (cachePtr->angle < 0) cachePtr->angle += 360; ! if (cachePtr->angle >= 180) cachePtr->angle -= 180; ! ! cachePtr->angle -= 90; ! ! //cachePtr->angle = (int)(cachePtr->angle / 18) * 18; p = get_metrics (&(cachePtr->point), &r, label_offsetx, label_offsety, --- 198,213 ---- cachePtr->status = 1; /* assume label *can* be drawn */ ! ! /* The stored point is not screen orieneted, rotate is needed */ ! roadmap_math_rotate_coordinates (1, &cachePtr->point); ! cachePtr->angle += roadmap_math_get_orientation (); ! ! while (cachePtr->angle > 360) cachePtr->angle -= 360; ! while (cachePtr->angle < 0) cachePtr->angle += 360; ! if (cachePtr->angle >= 180) cachePtr->angle -= 180; ! ! cachePtr->angle -= 90; ! ! //cachePtr->angle = (int)(cachePtr->angle / 18) * 18; p = get_metrics (&(cachePtr->point), &r, label_offsetx, label_offsety, *************** *** 251,255 **** } /* next label */ ! RoadMapLabelCache.numlabels = 0; RoadMapLabelCacheFull = 0; return 0; --- 249,253 ---- } /* next label */ ! RoadMapLabelCache.numlabels = 0; RoadMapLabelCacheFull = 0; return 0; Index: roadmap_label.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_label.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_label.h 21 Apr 2006 17:18:52 -0000 1.1 --- roadmap_label.h 23 Apr 2006 13:15:21 -0000 1.2 *************** *** 30,34 **** #include "roadmap_gui.h" ! #define MAX_LABELS 50 typedef struct { --- 30,34 ---- #include "roadmap_gui.h" ! #define MAX_LABELS 150 typedef struct { |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:14:28
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5166 Modified Files: roadmap_download.c Log Message: Fix usdir download. Index: roadmap_download.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_download.c 22 Mar 2006 08:51:13 -0000 1.4 --- roadmap_download.c 23 Apr 2006 13:14:21 -0000 1.5 *************** *** 484,503 **** strncpy (format+1, "usdir.rdm", sizeof(source) - (format - source + 1)); - strncpy (destination, roadmap_config_get (&RoadMapConfigDestination), sizeof(destination)); - destination[sizeof(destination)-1] = 0; - #ifndef _WIN32 ! format = strrchr (destination, '/'); #else ! format = strrchr (destination, '\\'); #endif - if (!format) { - roadmap_messagebox ("Download Error", "Can't download usdir."); - roadmap_log (ROADMAP_WARNING, "invalid download destination %s", destination); - roadmap_download_end (); - return; - } - - strncpy (format+1, "usdir.rdm", sizeof(destination) - (format - destination + 1)); directory = roadmap_path_parent (NULL, destination); --- 484,494 ---- strncpy (format+1, "usdir.rdm", sizeof(source) - (format - source + 1)); #ifndef _WIN32 ! snprintf (destination, sizeof(destination), "%s/usdir.rdm", ! roadmap_config_get (&RoadMapConfigDestination)); #else ! snprintf (destination, sizeof(destination), "%s\\usdir.rdm", ! roadmap_config_get (&RoadMapConfigDestination)); #endif directory = roadmap_path_parent (NULL, destination); |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:12:35
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3915 Modified Files: roadmap_canvas.h Log Message: Label support. Index: roadmap_canvas.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_canvas.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadmap_canvas.h 15 Oct 2005 22:19:05 -0000 1.1.1.1 --- roadmap_canvas.h 23 Apr 2006 13:12:31 -0000 1.2 *************** *** 132,135 **** --- 132,138 ---- void roadmap_canvas_save_screenshot (const char* filename); + void roadmap_canvas_draw_string_angle (RoadMapGuiPoint *position, RoadMapGuiPoint *center, + int angle, const char *text); + #endif // INCLUDE__ROADMAP_CANVAS__H |
|
From: Ehud S. <esh...@us...> - 2006-04-23 13:11:30
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3157 Modified Files: Makefile Log Message: Label support. Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 22 Mar 2006 08:46:52 -0000 1.10 --- Makefile 23 Apr 2006 13:11:24 -0000 1.11 *************** *** 152,155 **** --- 152,156 ---- roadmap_download.c \ roadmap_help.c \ + roadmap_label.c \ roadmap_start.c |
|
From: Ehud S. <esh...@us...> - 2006-04-22 09:49:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7003/fribidi Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/fribidi added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-04-22 09:49:13
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7003/libft Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libft added to the repository |
