diff --git a/README b/README index 25ad3c3a..c8ca8d9f 100644 --- a/README +++ b/README @@ -13,7 +13,6 @@ or you can build it and point your browser to doc/index.html. For more information on XMP support in Exiv2, see doc/README-XMP. - Building and Installing ======================= @@ -25,8 +24,9 @@ You can build the libraries in the following ways: http://dev.exiv2.org/projects/exiv2/wiki/FAQ 2 Microsoft Visual C++ - - see msvc/README-MSVC.txt (32bit build VC7.1/2003 and up) - - see msvc64/ReadMe.txt (32bit and 64bit build VC8/2005 and up) + - see msvc2003/ReadMe.txt (32bit build VC7.1/2003 2005,2008) + - see msvc2005/ReadMe.txt (32bit and 64bit build VC8/2005, 2008,2010) + - see msvc2012/ReadMe.txt (32bit and 64bit build VC11/2012 ) 3 CMake (experimental support for cmake on all platforms) - see README-CMAKE for more information @@ -97,7 +97,7 @@ doxygen http://www.doxygen.org/ graphviz http://www.graphviz.org/ python http://www.python.org/ xsltproc http://xmlsoft.org/XSLT/ - +md5sum http://www.microbrew.org/tools/md5sha1sum/ Troubleshooting =============== @@ -118,8 +118,8 @@ Please send feedback or queries to the Exiv2 forum. For new bug reports and feature requests, please open an issue. -Hacking -======= +Linking your own code with Exiv2 +================================ A pkg-config .pc file is installed together with the library. Application developers can use pkg-config(1) to obtain correct compile @@ -141,11 +141,10 @@ be a pain when trying to debug a program. For that reason, compilation of shared libraries can be turned off by specifying the --disable-shared option to the configure script. - License ======= -Copyright (C) 2004-2012 Andreas Huggel +Copyright (C) 2004-2013 Andreas Huggel Exiv2 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 @@ -166,7 +165,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. - Commercial version ================== @@ -175,7 +173,14 @@ the conversion of Nikon lens data to readable lens names to build a commercial version of the Exiv2 library. To do this on Windows, compile the library with the preprocessor -symbol EXV_COMMERCIAL_VERSION defined in msvc\include\exv_msvc.h or -msvc64\include\exv_msvc.h. On UNIX-like systems, run the configure +symbol EXV_COMMERCIAL_VERSION defined in: + msvc2003\include\exv_msvc.h +or msvc2005\include\exv_msvc.h +or msvc2012\include\exv_msvc.h + +On UNIX-like systems, run the configure script with the options --enable-commercial --disable-nls --disable-lensdata. + +# That's all Folks +## diff --git a/samples/geotag.cpp b/samples/geotag.cpp index 4381fccf..427bf0e3 100644 --- a/samples/geotag.cpp +++ b/samples/geotag.cpp @@ -22,6 +22,20 @@ #include #include +#if defined(__MINGW32__) || defined(__MINGW64__) +# ifndef __MINGW__ +# define __MINGW__ +# endif +#endif + +#ifdef __MINGW__ +// rmills: dummy off for MinGW. I don't have time to fix this for 0.24 +int main(int,const char**) +{ + return 0; +} +#else + using namespace std; #ifndef lengthof @@ -943,3 +957,4 @@ int main(int argc,const char* argv[]) return result ; } +#endif diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 6f4df208..98a2ae24 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -3,7 +3,7 @@ tmp/ Exiv2 version ------------------------------------------------------------ exiv2 0.24 001800 (__ bit build) -Copyright (C) 2004-2012 Andreas Huggel. +Copyright (C) 2004-2013 Andreas Huggel. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/website/master/download.html.in b/website/master/download.html.in index 00bbb231..74f1b3f5 100644 --- a/website/master/download.html.in +++ b/website/master/download.html.in @@ -16,7 +16,7 @@ __maintitle__ tool and a number of simple example and test applications. With a few additional third party tools you can also generate the complete API documentation. The package includes standard build files for - UNIX-like systems (including GNU/Linux, Mac OS X and MinGW) as well + UNIX-like systems (including GNU/Linux, Mac OS X, MinGW and Cygwin) as well as Visual Studio project files for Visual C++ .NET 2003 (MSVC 7.1) and later. After downloading and unpacking the distribution, please see the README file in the top directory for build and @@ -28,10 +28,9 @@ __maintitle__ parameter from a cmd shell: exiv2 -h. For details, read the man page. - The Windows executable was compiled with the - MinGW cross compiler - on an Intel 32 bit machine running - Debian. + The Windows executable was compiled using 32bit MinGW tools + MinGW + on an Intel 64 bit machine running Windows 7.

As an alternative to the packages here, many Linux distributions, diff --git a/website/master/index.html.in b/website/master/index.html.in index dad333c9..8f317a5e 100644 --- a/website/master/index.html.in +++ b/website/master/index.html.in @@ -75,9 +75,9 @@ Exiv2 is available as free software and with

  • a unified metadata container
  • support for additional image formats
  • more Makernotes
    • -
  • To support CMake on all platforms
    • -
  • Video Write Support
    • -
  • Remote IO - support for http/ftp/ssh and other protocols
    • +
  • to support CMake on all platforms
    • +
  • video write wupport
    • +
  • remote io - support for http/ftp/ssh and other protocols

    • The roadmap has details for the upcoming version.