From 6209aa6374a226cc889b4578a505b91f3ec0ec7e Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Fri, 17 Nov 2006 22:16:33 +0000 Subject: Uploaded PROJ.4 port for Windows CE. git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1377 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- src/nad_init.c | 14 +- src/pj_gridinfo.c | 14 +- src/pj_gridlist.c | 14 +- src/pj_open_lib.c | 8 + src/projects.h | 12 + wince/msvc80/README.txt | 23 + wince/msvc80/projce_common.vsprops | 15 + wince/msvc80/projce_dll/projce_dll.sln | 43 ++ wince/msvc80/projce_dll/projce_dll.vcproj | 991 ++++++++++++++++++++++++++++++ wince/msvc80/projce_lib/projce_lib.sln | 43 ++ wince/msvc80/projce_lib/projce_lib.vcproj | 955 ++++++++++++++++++++++++++++ 11 files changed, 2129 insertions(+), 3 deletions(-) create mode 100644 wince/msvc80/README.txt create mode 100644 wince/msvc80/projce_common.vsprops create mode 100644 wince/msvc80/projce_dll/projce_dll.sln create mode 100644 wince/msvc80/projce_dll/projce_dll.vcproj create mode 100644 wince/msvc80/projce_lib/projce_lib.sln create mode 100644 wince/msvc80/projce_lib/projce_lib.vcproj diff --git a/src/nad_init.c b/src/nad_init.c index f582b747..936bada5 100644 --- a/src/nad_init.c +++ b/src/nad_init.c @@ -28,6 +28,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.9 2006/11/17 22:16:30 mloskot + * Uploaded PROJ.4 port for Windows CE. + * * Revision 1.8 2003/03/17 18:56:01 warmerda * implement delayed loading of ctable format files * @@ -53,9 +56,18 @@ #include #include #include -#include #include +#ifdef _WIN32_WCE +/* assert.h includes all Windows API headers and causes 'LP' name clash. + * Here assert we disable assert() for Windows CE. + * TODO - mloskot: re-implement porting friendly assert + */ +# define assert(exp) ((void)0) +#else +# include +#endif /* _WIN32_WCE */ + /************************************************************************/ /* nad_ctable_load() */ /* */ diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 19dc1bf5..2eaf6a09 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -29,6 +29,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.8 2006/11/17 22:16:30 mloskot + * Uploaded PROJ.4 port for Windows CE. + * * Revision 1.7 2005/07/07 00:16:03 fwarmerdam * Fixed debug fprintf syntax per: * http://bugzilla.remotesensing.org/show_bug.cgi?id=886 @@ -59,7 +62,16 @@ #include #include #include -#include + +#ifdef _WIN32_WCE +/* assert.h includes all Windows API headers and causes 'LP' name clash. + * Here assert we disable assert() for Windows CE. + * TODO - mloskot: re-implement porting friendly assert + */ +# define assert(exp) ((void)0) +#else +# include +#endif /* _WIN32_WCE */ /************************************************************************/ /* swap_words() */ diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index f30d2c55..e86dd575 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -29,6 +29,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.5 2006/11/17 22:16:30 mloskot + * Uploaded PROJ.4 port for Windows CE. + * * Revision 1.4 2005/11/01 05:56:13 fwarmerdam * improved error handling if gridcount is zero * @@ -48,7 +51,16 @@ #include #include #include -#include + +#ifdef _WIN32_WCE +/* assert.h includes all Windows API headers and causes 'LP' name clash. + * Here assert we disable assert() for Windows CE. + * TODO - mloskot: re-implement porting friendly assert + */ +# define assert(exp) ((void)0) +#else +# include +#endif /* _WIN32_WCE */ static PJ_GRIDINFO *grid_list = NULL; diff --git a/src/pj_open_lib.c b/src/pj_open_lib.c index e7b26ca6..e53e8e2d 100644 --- a/src/pj_open_lib.c +++ b/src/pj_open_lib.c @@ -31,6 +31,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.7 2006/11/17 22:16:30 mloskot + * Uploaded PROJ.4 port for Windows CE. + * * Revision 1.6 2004/09/16 15:14:01 fwarmerdam * * src/pj_open_lib.c: added pj_set_searchpath() provided by Eric Miller. * @@ -111,6 +114,8 @@ pj_open_lib(char *name, char *mode) { int n = 0; int i; +#ifndef _WIN32_WCE + /* check if ~/name */ if (*name == '~' && name[1] == DIR_CHAR) if (sysname = getenv("HOME")) { @@ -163,4 +168,7 @@ pj_open_lib(char *name, char *mode) { fid == NULL ? "failed" : "succeeded" ); return(fid); +#else + return NULL; +#endif /* _WIN32_WCE */ } diff --git a/src/projects.h b/src/projects.h index 80bccab5..a8e6e28e 100644 --- a/src/projects.h +++ b/src/projects.h @@ -28,6 +28,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.25 2006/11/17 22:16:30 mloskot + * Uploaded PROJ.4 port for Windows CE. + * * Revision 1.24 2006/10/18 04:34:03 fwarmerdam * added mlist functions from libproj4 * @@ -147,6 +150,15 @@ extern "C" { /* prototype hypot for systems where absent */ #ifndef _WIN32 extern double hypot(double, double); +#endif + +#ifdef _WIN32_WCE +# include +# include +# define rewind wceex_rewind +# define getenv wceex_getenv +# define strdup _strdup +# define hypot _hypot #endif /* some useful constants */ diff --git a/wince/msvc80/README.txt b/wince/msvc80/README.txt new file mode 100644 index 00000000..8579bc32 --- /dev/null +++ b/wince/msvc80/README.txt @@ -0,0 +1,23 @@ +------------------------------------------------------------------------------- +PROJ.4 port for Windows CE +Author: Mateusz Loskot (mateusz@loskot.net) +------------------------------------------------------------------------------- + +TODO - explain usage details. + +FAST NOTE: +Add project for WCELIBCEX library to the solution. +WCELIBCEX library sources are required to build PROJ.4 port for Windows CE. +You can configure projce_dll and projce_lib projects to use WCELIBCEX through +separate project file set as dependency or in binary form, +using prepared static library. + +Configure path to WCELIBCEX sources +----------------------------------- +1. Open View -> Property Manager. +2. Expand one of node under projce_dll or projce_lib project +3. Double-click on projce_common property sheet +4. Go to User Macros +5. Select WCELIBCEX_DIR macro and set path pointing directly to directory +where you downloaded the WCELIBCEX library sources tree. +6. Click OK and close the dialog box \ No newline at end of file diff --git a/wince/msvc80/projce_common.vsprops b/wince/msvc80/projce_common.vsprops new file mode 100644 index 00000000..18865116 --- /dev/null +++ b/wince/msvc80/projce_common.vsprops @@ -0,0 +1,15 @@ + + + + + diff --git a/wince/msvc80/projce_dll/projce_dll.sln b/wince/msvc80/projce_dll/projce_dll.sln new file mode 100644 index 00000000..1f005aff --- /dev/null +++ b/wince/msvc80/projce_dll/projce_dll.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projce_dll", "projce_dll.vcproj", "{A5AFA635-6DD3-4437-9115-13C9B57138BE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E123D79D-AEC4-4122-8F53-14BCA5E575E7}" + ProjectSection(SolutionItems) = preProject + ..\README.txt = ..\README.txt + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) + Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4) + Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) + Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4) + Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4) + Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {A5AFA635-6DD3-4437-9115-13C9B57138BE}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/wince/msvc80/projce_dll/projce_dll.vcproj b/wince/msvc80/projce_dll/projce_dll.vcproj new file mode 100644 index 00000000..580afe47 --- /dev/null +++ b/wince/msvc80/projce_dll/projce_dll.vcproj @@ -0,0 +1,991 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wince/msvc80/projce_lib/projce_lib.sln b/wince/msvc80/projce_lib/projce_lib.sln new file mode 100644 index 00000000..df950009 --- /dev/null +++ b/wince/msvc80/projce_lib/projce_lib.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projce_lib", "projce_lib.vcproj", "{E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1619681D-2192-42F6-AF3E-7016F3735D5E}" + ProjectSection(SolutionItems) = preProject + ..\README.txt = ..\README.txt + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) + Debug|Smartphone 2003 (ARMV4) = Debug|Smartphone 2003 (ARMV4) + Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) + Release|Pocket PC 2003 (ARMV4) = Release|Pocket PC 2003 (ARMV4) + Release|Smartphone 2003 (ARMV4) = Release|Smartphone 2003 (ARMV4) + Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + {E33BA2AA-25D9-48B1-A9FB-F77EB915AD72}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/wince/msvc80/projce_lib/projce_lib.vcproj b/wince/msvc80/projce_lib/projce_lib.vcproj new file mode 100644 index 00000000..13f00e35 --- /dev/null +++ b/wince/msvc80/projce_lib/projce_lib.vcproj @@ -0,0 +1,955 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3