diff -Naur exiv2-0.26.orig/test/functions.source exiv2-0.26/test/functions.source --- exiv2-0.26.orig/test/functions.source 2017-04-26 21:16:21.000000000 +0200 +++ exiv2-0.26/test/functions.source 2017-06-20 23:59:49.920106800 +0200 @@ -440,6 +440,8 @@ testdir="$here/tmp" datadir="../data" + mkdir -p $testdir + if [ -z "$EXIV2_BINDIR" ] ; then bin="$here/../bin/" else @@ -452,6 +454,7 @@ elif [ "${os:0:4}" == "MING" ]; then export PLATFORM=mingw # bin=$(dirname $(which exiv2)) + bin=$(cygpath $EXIV2_BINDIR) else export PLATFORM=$os fi $ diff -Naur exiv2-0.26.orig/include/exiv2/config.h.orig exiv2-0.26/include/exiv2/config.h --- exiv2-0.26.orig/include/exiv2/config.h.orig 2017-08-31 10:06:58.847065500 +0200 +++ exiv2-0.26/include/exiv2/config.h 2017-06-21 19:54:35.768220600 +0200 @@ -158,9 +158,9 @@ # ifdef EXV_HAVE_REGEX # undef EXV_HAVE_REGEX # endif -#ifdef EXV_UNICODE_PATH -#error EXV_UNICODE_PATH is not supported for MinGW builds -#endif +//#ifdef EXV_UNICODE_PATH +//#error EXV_UNICODE_PATH is not supported for MinGW builds +//#endif #endif #ifndef __CYGWIN__ diff -Naur exiv2-0.26/src/actions.cpp.orig exiv2-0.26/src/actions.cpp --- exiv2-0.26/src/actions.cpp.orig 2017-04-26 21:16:21.000000000 +0200 +++ exiv2-0.26/src/actions.cpp 2017-08-31 10:58:49.555946500 +0200 @@ -2117,11 +2117,11 @@ Action::Modify::applyCommands(sourceImage.get()); // Open or create the target file -#ifdef EXV_UNICODE_PATH - std::string target = bStdout ? Exiv2::ws2s(temporaryPath()) : tgt; -#else +//#ifdef EXV_UNICODE_PATH +// std::string target = bStdout ? Exiv2::ws2s(temporaryPath()) : tgt; +//#else std::string target = bStdout ? temporaryPath() : tgt; -#endif +//#endif Exiv2::Image::AutoPtr targetImage; if (Exiv2::fileExists(target)) {