From 73f991378609c71c37bff37956562d934122b64f Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 5 Apr 2020 09:22:32 +0100 Subject: [PATCH 01/13] sridharb1_contrib_msvc4_0.27 --- contrib/{msvc2019 => vs2019}/LICENSE | 0 contrib/{msvc2019 => vs2019}/README.md | 0 contrib/{msvc2019 => vs2019}/solution/exiv2.sln | 0 contrib/{msvc2019 => vs2019}/solution/exiv2lib_export.h | 0 contrib/{msvc2019 => vs2019}/solution/exv_conf.h | 0 contrib/{msvc2019 => vs2019}/solution/samples/addmoddel.vcxproj | 0 .../solution/samples/addmoddel.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/conntest.vcxproj | 0 .../solution/samples/conntest.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/convert-test.vcxproj | 0 .../solution/samples/convert-test.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/easyaccess-test.vcxproj | 0 .../solution/samples/easyaccess-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/exifcomment.vcxproj | 0 .../solution/samples/exifcomment.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/exifdata-test.vcxproj | 0 .../solution/samples/exifdata-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/exifdata.vcxproj | 0 .../solution/samples/exifdata.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/exifprint.vcxproj | 0 .../solution/samples/exifprint.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/exifvalue.vcxproj | 0 .../solution/samples/exifvalue.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/exiv2json.vcxproj | 0 .../solution/samples/exiv2json.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/geotag.vcxproj | 0 .../{msvc2019 => vs2019}/solution/samples/geotag.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/getopt-test.vcxproj | 0 .../solution/samples/getopt-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/ini-test.vcxproj | 0 .../solution/samples/ini-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/iotest.vcxproj | 0 .../{msvc2019 => vs2019}/solution/samples/iotest.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/iptceasy.vcxproj | 0 .../solution/samples/iptceasy.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/iptcprint.vcxproj | 0 .../solution/samples/iptcprint.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/iptctest.vcxproj | 0 .../solution/samples/iptctest.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/key-test.vcxproj | 0 .../solution/samples/key-test.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/largeiptc-test.vcxproj | 0 .../solution/samples/largeiptc-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/metacopy.vcxproj | 0 .../solution/samples/metacopy.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/mmap-test.vcxproj | 0 .../solution/samples/mmap-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/mrwthumb.vcxproj | 0 .../solution/samples/mrwthumb.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/pathtest.vcxproj | 0 .../solution/samples/pathtest.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/prevtest.vcxproj | 0 .../solution/samples/prevtest.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/remotetest.vcxproj | 0 .../solution/samples/remotetest.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/stringto-test.vcxproj | 0 .../solution/samples/stringto-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/taglist.vcxproj | 0 .../{msvc2019 => vs2019}/solution/samples/taglist.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/tiff-test.vcxproj | 0 .../solution/samples/tiff-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/werror-test.vcxproj | 0 .../solution/samples/werror-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/write-test.vcxproj | 0 .../solution/samples/write-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/write2-test.vcxproj | 0 .../solution/samples/write2-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/xmpdump.vcxproj | 0 .../{msvc2019 => vs2019}/solution/samples/xmpdump.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/xmpparse.vcxproj | 0 .../solution/samples/xmpparse.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/samples/xmpparser-test.vcxproj | 0 .../solution/samples/xmpparser-test.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/xmpprint.vcxproj | 0 .../solution/samples/xmpprint.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/samples/xmpsample.vcxproj | 0 .../solution/samples/xmpsample.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/src/exiv2.vcxproj | 0 contrib/{msvc2019 => vs2019}/solution/src/exiv2.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/src/exiv2lib.vcxproj | 0 .../{msvc2019 => vs2019}/solution/src/exiv2lib.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/src/exiv2lib_int.vcxproj | 0 .../solution/src/exiv2lib_int.vcxproj.filters | 0 .../{msvc2019 => vs2019}/solution/unitTests/unit_tests.vcxproj | 0 .../solution/unitTests/unit_tests.vcxproj.filters | 0 contrib/{msvc2019 => vs2019}/solution/xmpsdk/exiv2-xmp.vcxproj | 0 .../solution/xmpsdk/exiv2-xmp.vcxproj.filters | 0 87 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{msvc2019 => vs2019}/LICENSE (100%) rename contrib/{msvc2019 => vs2019}/README.md (100%) rename contrib/{msvc2019 => vs2019}/solution/exiv2.sln (100%) rename contrib/{msvc2019 => vs2019}/solution/exiv2lib_export.h (100%) rename contrib/{msvc2019 => vs2019}/solution/exv_conf.h (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/addmoddel.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/addmoddel.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/conntest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/conntest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/convert-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/convert-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/easyaccess-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/easyaccess-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifcomment.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifcomment.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifdata-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifdata-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifdata.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifdata.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifprint.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifprint.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifvalue.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exifvalue.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exiv2json.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/exiv2json.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/geotag.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/geotag.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/getopt-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/getopt-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/ini-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/ini-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iotest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iotest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptceasy.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptceasy.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptcprint.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptcprint.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptctest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/iptctest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/key-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/key-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/largeiptc-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/largeiptc-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/metacopy.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/metacopy.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/mmap-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/mmap-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/mrwthumb.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/mrwthumb.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/pathtest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/pathtest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/prevtest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/prevtest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/remotetest.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/remotetest.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/stringto-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/stringto-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/taglist.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/taglist.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/tiff-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/tiff-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/werror-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/werror-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/write-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/write-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/write2-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/write2-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpdump.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpdump.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpparse.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpparse.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpparser-test.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpparser-test.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpprint.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpprint.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpsample.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/samples/xmpsample.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2lib.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2lib.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2lib_int.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/src/exiv2lib_int.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/unitTests/unit_tests.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/unitTests/unit_tests.vcxproj.filters (100%) rename contrib/{msvc2019 => vs2019}/solution/xmpsdk/exiv2-xmp.vcxproj (100%) rename contrib/{msvc2019 => vs2019}/solution/xmpsdk/exiv2-xmp.vcxproj.filters (100%) diff --git a/contrib/msvc2019/LICENSE b/contrib/vs2019/LICENSE similarity index 100% rename from contrib/msvc2019/LICENSE rename to contrib/vs2019/LICENSE diff --git a/contrib/msvc2019/README.md b/contrib/vs2019/README.md similarity index 100% rename from contrib/msvc2019/README.md rename to contrib/vs2019/README.md diff --git a/contrib/msvc2019/solution/exiv2.sln b/contrib/vs2019/solution/exiv2.sln similarity index 100% rename from contrib/msvc2019/solution/exiv2.sln rename to contrib/vs2019/solution/exiv2.sln diff --git a/contrib/msvc2019/solution/exiv2lib_export.h b/contrib/vs2019/solution/exiv2lib_export.h similarity index 100% rename from contrib/msvc2019/solution/exiv2lib_export.h rename to contrib/vs2019/solution/exiv2lib_export.h diff --git a/contrib/msvc2019/solution/exv_conf.h b/contrib/vs2019/solution/exv_conf.h similarity index 100% rename from contrib/msvc2019/solution/exv_conf.h rename to contrib/vs2019/solution/exv_conf.h diff --git a/contrib/msvc2019/solution/samples/addmoddel.vcxproj b/contrib/vs2019/solution/samples/addmoddel.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/addmoddel.vcxproj rename to contrib/vs2019/solution/samples/addmoddel.vcxproj diff --git a/contrib/msvc2019/solution/samples/addmoddel.vcxproj.filters b/contrib/vs2019/solution/samples/addmoddel.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/addmoddel.vcxproj.filters rename to contrib/vs2019/solution/samples/addmoddel.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/conntest.vcxproj b/contrib/vs2019/solution/samples/conntest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/conntest.vcxproj rename to contrib/vs2019/solution/samples/conntest.vcxproj diff --git a/contrib/msvc2019/solution/samples/conntest.vcxproj.filters b/contrib/vs2019/solution/samples/conntest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/conntest.vcxproj.filters rename to contrib/vs2019/solution/samples/conntest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/convert-test.vcxproj b/contrib/vs2019/solution/samples/convert-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/convert-test.vcxproj rename to contrib/vs2019/solution/samples/convert-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/convert-test.vcxproj.filters b/contrib/vs2019/solution/samples/convert-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/convert-test.vcxproj.filters rename to contrib/vs2019/solution/samples/convert-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/easyaccess-test.vcxproj b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/easyaccess-test.vcxproj rename to contrib/vs2019/solution/samples/easyaccess-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/easyaccess-test.vcxproj.filters b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/easyaccess-test.vcxproj.filters rename to contrib/vs2019/solution/samples/easyaccess-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exifcomment.vcxproj b/contrib/vs2019/solution/samples/exifcomment.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exifcomment.vcxproj rename to contrib/vs2019/solution/samples/exifcomment.vcxproj diff --git a/contrib/msvc2019/solution/samples/exifcomment.vcxproj.filters b/contrib/vs2019/solution/samples/exifcomment.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exifcomment.vcxproj.filters rename to contrib/vs2019/solution/samples/exifcomment.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exifdata-test.vcxproj b/contrib/vs2019/solution/samples/exifdata-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exifdata-test.vcxproj rename to contrib/vs2019/solution/samples/exifdata-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/exifdata-test.vcxproj.filters b/contrib/vs2019/solution/samples/exifdata-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exifdata-test.vcxproj.filters rename to contrib/vs2019/solution/samples/exifdata-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exifdata.vcxproj b/contrib/vs2019/solution/samples/exifdata.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exifdata.vcxproj rename to contrib/vs2019/solution/samples/exifdata.vcxproj diff --git a/contrib/msvc2019/solution/samples/exifdata.vcxproj.filters b/contrib/vs2019/solution/samples/exifdata.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exifdata.vcxproj.filters rename to contrib/vs2019/solution/samples/exifdata.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exifprint.vcxproj b/contrib/vs2019/solution/samples/exifprint.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exifprint.vcxproj rename to contrib/vs2019/solution/samples/exifprint.vcxproj diff --git a/contrib/msvc2019/solution/samples/exifprint.vcxproj.filters b/contrib/vs2019/solution/samples/exifprint.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exifprint.vcxproj.filters rename to contrib/vs2019/solution/samples/exifprint.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exifvalue.vcxproj b/contrib/vs2019/solution/samples/exifvalue.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exifvalue.vcxproj rename to contrib/vs2019/solution/samples/exifvalue.vcxproj diff --git a/contrib/msvc2019/solution/samples/exifvalue.vcxproj.filters b/contrib/vs2019/solution/samples/exifvalue.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exifvalue.vcxproj.filters rename to contrib/vs2019/solution/samples/exifvalue.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/exiv2json.vcxproj b/contrib/vs2019/solution/samples/exiv2json.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/exiv2json.vcxproj rename to contrib/vs2019/solution/samples/exiv2json.vcxproj diff --git a/contrib/msvc2019/solution/samples/exiv2json.vcxproj.filters b/contrib/vs2019/solution/samples/exiv2json.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/exiv2json.vcxproj.filters rename to contrib/vs2019/solution/samples/exiv2json.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/geotag.vcxproj b/contrib/vs2019/solution/samples/geotag.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/geotag.vcxproj rename to contrib/vs2019/solution/samples/geotag.vcxproj diff --git a/contrib/msvc2019/solution/samples/geotag.vcxproj.filters b/contrib/vs2019/solution/samples/geotag.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/geotag.vcxproj.filters rename to contrib/vs2019/solution/samples/geotag.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/getopt-test.vcxproj b/contrib/vs2019/solution/samples/getopt-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/getopt-test.vcxproj rename to contrib/vs2019/solution/samples/getopt-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/getopt-test.vcxproj.filters b/contrib/vs2019/solution/samples/getopt-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/getopt-test.vcxproj.filters rename to contrib/vs2019/solution/samples/getopt-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/ini-test.vcxproj b/contrib/vs2019/solution/samples/ini-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/ini-test.vcxproj rename to contrib/vs2019/solution/samples/ini-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/ini-test.vcxproj.filters b/contrib/vs2019/solution/samples/ini-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/ini-test.vcxproj.filters rename to contrib/vs2019/solution/samples/ini-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/iotest.vcxproj b/contrib/vs2019/solution/samples/iotest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/iotest.vcxproj rename to contrib/vs2019/solution/samples/iotest.vcxproj diff --git a/contrib/msvc2019/solution/samples/iotest.vcxproj.filters b/contrib/vs2019/solution/samples/iotest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/iotest.vcxproj.filters rename to contrib/vs2019/solution/samples/iotest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/iptceasy.vcxproj b/contrib/vs2019/solution/samples/iptceasy.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/iptceasy.vcxproj rename to contrib/vs2019/solution/samples/iptceasy.vcxproj diff --git a/contrib/msvc2019/solution/samples/iptceasy.vcxproj.filters b/contrib/vs2019/solution/samples/iptceasy.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/iptceasy.vcxproj.filters rename to contrib/vs2019/solution/samples/iptceasy.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/iptcprint.vcxproj b/contrib/vs2019/solution/samples/iptcprint.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/iptcprint.vcxproj rename to contrib/vs2019/solution/samples/iptcprint.vcxproj diff --git a/contrib/msvc2019/solution/samples/iptcprint.vcxproj.filters b/contrib/vs2019/solution/samples/iptcprint.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/iptcprint.vcxproj.filters rename to contrib/vs2019/solution/samples/iptcprint.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/iptctest.vcxproj b/contrib/vs2019/solution/samples/iptctest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/iptctest.vcxproj rename to contrib/vs2019/solution/samples/iptctest.vcxproj diff --git a/contrib/msvc2019/solution/samples/iptctest.vcxproj.filters b/contrib/vs2019/solution/samples/iptctest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/iptctest.vcxproj.filters rename to contrib/vs2019/solution/samples/iptctest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/key-test.vcxproj b/contrib/vs2019/solution/samples/key-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/key-test.vcxproj rename to contrib/vs2019/solution/samples/key-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/key-test.vcxproj.filters b/contrib/vs2019/solution/samples/key-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/key-test.vcxproj.filters rename to contrib/vs2019/solution/samples/key-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/largeiptc-test.vcxproj b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/largeiptc-test.vcxproj rename to contrib/vs2019/solution/samples/largeiptc-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/largeiptc-test.vcxproj.filters b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/largeiptc-test.vcxproj.filters rename to contrib/vs2019/solution/samples/largeiptc-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/metacopy.vcxproj b/contrib/vs2019/solution/samples/metacopy.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/metacopy.vcxproj rename to contrib/vs2019/solution/samples/metacopy.vcxproj diff --git a/contrib/msvc2019/solution/samples/metacopy.vcxproj.filters b/contrib/vs2019/solution/samples/metacopy.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/metacopy.vcxproj.filters rename to contrib/vs2019/solution/samples/metacopy.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/mmap-test.vcxproj b/contrib/vs2019/solution/samples/mmap-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/mmap-test.vcxproj rename to contrib/vs2019/solution/samples/mmap-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/mmap-test.vcxproj.filters b/contrib/vs2019/solution/samples/mmap-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/mmap-test.vcxproj.filters rename to contrib/vs2019/solution/samples/mmap-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/mrwthumb.vcxproj b/contrib/vs2019/solution/samples/mrwthumb.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/mrwthumb.vcxproj rename to contrib/vs2019/solution/samples/mrwthumb.vcxproj diff --git a/contrib/msvc2019/solution/samples/mrwthumb.vcxproj.filters b/contrib/vs2019/solution/samples/mrwthumb.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/mrwthumb.vcxproj.filters rename to contrib/vs2019/solution/samples/mrwthumb.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/pathtest.vcxproj b/contrib/vs2019/solution/samples/pathtest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/pathtest.vcxproj rename to contrib/vs2019/solution/samples/pathtest.vcxproj diff --git a/contrib/msvc2019/solution/samples/pathtest.vcxproj.filters b/contrib/vs2019/solution/samples/pathtest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/pathtest.vcxproj.filters rename to contrib/vs2019/solution/samples/pathtest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/prevtest.vcxproj b/contrib/vs2019/solution/samples/prevtest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/prevtest.vcxproj rename to contrib/vs2019/solution/samples/prevtest.vcxproj diff --git a/contrib/msvc2019/solution/samples/prevtest.vcxproj.filters b/contrib/vs2019/solution/samples/prevtest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/prevtest.vcxproj.filters rename to contrib/vs2019/solution/samples/prevtest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/remotetest.vcxproj b/contrib/vs2019/solution/samples/remotetest.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/remotetest.vcxproj rename to contrib/vs2019/solution/samples/remotetest.vcxproj diff --git a/contrib/msvc2019/solution/samples/remotetest.vcxproj.filters b/contrib/vs2019/solution/samples/remotetest.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/remotetest.vcxproj.filters rename to contrib/vs2019/solution/samples/remotetest.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/stringto-test.vcxproj b/contrib/vs2019/solution/samples/stringto-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/stringto-test.vcxproj rename to contrib/vs2019/solution/samples/stringto-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/stringto-test.vcxproj.filters b/contrib/vs2019/solution/samples/stringto-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/stringto-test.vcxproj.filters rename to contrib/vs2019/solution/samples/stringto-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/taglist.vcxproj b/contrib/vs2019/solution/samples/taglist.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/taglist.vcxproj rename to contrib/vs2019/solution/samples/taglist.vcxproj diff --git a/contrib/msvc2019/solution/samples/taglist.vcxproj.filters b/contrib/vs2019/solution/samples/taglist.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/taglist.vcxproj.filters rename to contrib/vs2019/solution/samples/taglist.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/tiff-test.vcxproj b/contrib/vs2019/solution/samples/tiff-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/tiff-test.vcxproj rename to contrib/vs2019/solution/samples/tiff-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/tiff-test.vcxproj.filters b/contrib/vs2019/solution/samples/tiff-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/tiff-test.vcxproj.filters rename to contrib/vs2019/solution/samples/tiff-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/werror-test.vcxproj b/contrib/vs2019/solution/samples/werror-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/werror-test.vcxproj rename to contrib/vs2019/solution/samples/werror-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/werror-test.vcxproj.filters b/contrib/vs2019/solution/samples/werror-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/werror-test.vcxproj.filters rename to contrib/vs2019/solution/samples/werror-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/write-test.vcxproj b/contrib/vs2019/solution/samples/write-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/write-test.vcxproj rename to contrib/vs2019/solution/samples/write-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/write-test.vcxproj.filters b/contrib/vs2019/solution/samples/write-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/write-test.vcxproj.filters rename to contrib/vs2019/solution/samples/write-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/write2-test.vcxproj b/contrib/vs2019/solution/samples/write2-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/write2-test.vcxproj rename to contrib/vs2019/solution/samples/write2-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/write2-test.vcxproj.filters b/contrib/vs2019/solution/samples/write2-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/write2-test.vcxproj.filters rename to contrib/vs2019/solution/samples/write2-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/xmpdump.vcxproj b/contrib/vs2019/solution/samples/xmpdump.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/xmpdump.vcxproj rename to contrib/vs2019/solution/samples/xmpdump.vcxproj diff --git a/contrib/msvc2019/solution/samples/xmpdump.vcxproj.filters b/contrib/vs2019/solution/samples/xmpdump.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/xmpdump.vcxproj.filters rename to contrib/vs2019/solution/samples/xmpdump.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/xmpparse.vcxproj b/contrib/vs2019/solution/samples/xmpparse.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/xmpparse.vcxproj rename to contrib/vs2019/solution/samples/xmpparse.vcxproj diff --git a/contrib/msvc2019/solution/samples/xmpparse.vcxproj.filters b/contrib/vs2019/solution/samples/xmpparse.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/xmpparse.vcxproj.filters rename to contrib/vs2019/solution/samples/xmpparse.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/xmpparser-test.vcxproj b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/xmpparser-test.vcxproj rename to contrib/vs2019/solution/samples/xmpparser-test.vcxproj diff --git a/contrib/msvc2019/solution/samples/xmpparser-test.vcxproj.filters b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/xmpparser-test.vcxproj.filters rename to contrib/vs2019/solution/samples/xmpparser-test.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/xmpprint.vcxproj b/contrib/vs2019/solution/samples/xmpprint.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/xmpprint.vcxproj rename to contrib/vs2019/solution/samples/xmpprint.vcxproj diff --git a/contrib/msvc2019/solution/samples/xmpprint.vcxproj.filters b/contrib/vs2019/solution/samples/xmpprint.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/xmpprint.vcxproj.filters rename to contrib/vs2019/solution/samples/xmpprint.vcxproj.filters diff --git a/contrib/msvc2019/solution/samples/xmpsample.vcxproj b/contrib/vs2019/solution/samples/xmpsample.vcxproj similarity index 100% rename from contrib/msvc2019/solution/samples/xmpsample.vcxproj rename to contrib/vs2019/solution/samples/xmpsample.vcxproj diff --git a/contrib/msvc2019/solution/samples/xmpsample.vcxproj.filters b/contrib/vs2019/solution/samples/xmpsample.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/samples/xmpsample.vcxproj.filters rename to contrib/vs2019/solution/samples/xmpsample.vcxproj.filters diff --git a/contrib/msvc2019/solution/src/exiv2.vcxproj b/contrib/vs2019/solution/src/exiv2.vcxproj similarity index 100% rename from contrib/msvc2019/solution/src/exiv2.vcxproj rename to contrib/vs2019/solution/src/exiv2.vcxproj diff --git a/contrib/msvc2019/solution/src/exiv2.vcxproj.filters b/contrib/vs2019/solution/src/exiv2.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/src/exiv2.vcxproj.filters rename to contrib/vs2019/solution/src/exiv2.vcxproj.filters diff --git a/contrib/msvc2019/solution/src/exiv2lib.vcxproj b/contrib/vs2019/solution/src/exiv2lib.vcxproj similarity index 100% rename from contrib/msvc2019/solution/src/exiv2lib.vcxproj rename to contrib/vs2019/solution/src/exiv2lib.vcxproj diff --git a/contrib/msvc2019/solution/src/exiv2lib.vcxproj.filters b/contrib/vs2019/solution/src/exiv2lib.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/src/exiv2lib.vcxproj.filters rename to contrib/vs2019/solution/src/exiv2lib.vcxproj.filters diff --git a/contrib/msvc2019/solution/src/exiv2lib_int.vcxproj b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj similarity index 100% rename from contrib/msvc2019/solution/src/exiv2lib_int.vcxproj rename to contrib/vs2019/solution/src/exiv2lib_int.vcxproj diff --git a/contrib/msvc2019/solution/src/exiv2lib_int.vcxproj.filters b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/src/exiv2lib_int.vcxproj.filters rename to contrib/vs2019/solution/src/exiv2lib_int.vcxproj.filters diff --git a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj similarity index 100% rename from contrib/msvc2019/solution/unitTests/unit_tests.vcxproj rename to contrib/vs2019/solution/unitTests/unit_tests.vcxproj diff --git a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj.filters b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/unitTests/unit_tests.vcxproj.filters rename to contrib/vs2019/solution/unitTests/unit_tests.vcxproj.filters diff --git a/contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj similarity index 100% rename from contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj rename to contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj diff --git a/contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters similarity index 100% rename from contrib/msvc2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters rename to contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj.filters From 9f884371699810084cc2fe412ecdb13d05be6774 Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 5 Apr 2020 09:31:05 +0100 Subject: [PATCH 02/13] sridharb1_contrib_msvc4_0.27 --- contrib/vs2019/LICENSE | 2 +- contrib/vs2019/README.md | 6 +- contrib/vs2019/solution/exiv2.sln | 24 +- .../vs2019/solution/samples/addmoddel.vcxproj | 54 +-- .../vs2019/solution/samples/conntest.vcxproj | 54 +-- .../solution/samples/convert-test.vcxproj | 54 +-- .../solution/samples/easyaccess-test.vcxproj | 54 +-- .../solution/samples/exifcomment.vcxproj | 54 +-- .../solution/samples/exifdata-test.vcxproj | 54 +-- .../vs2019/solution/samples/exifdata.vcxproj | 54 +-- .../vs2019/solution/samples/exifprint.vcxproj | 54 +-- .../vs2019/solution/samples/exifvalue.vcxproj | 54 +-- .../vs2019/solution/samples/exiv2json.vcxproj | 58 +-- .../vs2019/solution/samples/geotag.vcxproj | 54 +-- .../solution/samples/getopt-test.vcxproj | 58 +-- .../vs2019/solution/samples/ini-test.vcxproj | 54 +-- .../vs2019/solution/samples/iotest.vcxproj | 54 +-- .../vs2019/solution/samples/iptceasy.vcxproj | 54 +-- .../vs2019/solution/samples/iptcprint.vcxproj | 54 +-- .../vs2019/solution/samples/iptctest.vcxproj | 54 +-- .../vs2019/solution/samples/key-test.vcxproj | 54 +-- .../solution/samples/largeiptc-test.vcxproj | 54 +-- .../vs2019/solution/samples/metacopy.vcxproj | 58 +-- .../vs2019/solution/samples/mmap-test.vcxproj | 54 +-- .../vs2019/solution/samples/mrwthumb.vcxproj | 50 +-- .../vs2019/solution/samples/pathtest.vcxproj | 58 +-- .../vs2019/solution/samples/prevtest.vcxproj | 54 +-- .../solution/samples/remotetest.vcxproj | 54 +-- .../solution/samples/stringto-test.vcxproj | 54 +-- .../vs2019/solution/samples/taglist.vcxproj | 54 +-- .../vs2019/solution/samples/tiff-test.vcxproj | 54 +-- .../solution/samples/werror-test.vcxproj | 54 +-- .../solution/samples/write-test.vcxproj | 54 +-- .../solution/samples/write2-test.vcxproj | 54 +-- .../vs2019/solution/samples/xmpdump.vcxproj | 54 +-- .../vs2019/solution/samples/xmpparse.vcxproj | 54 +-- .../solution/samples/xmpparser-test.vcxproj | 54 +-- .../vs2019/solution/samples/xmpprint.vcxproj | 54 +-- .../vs2019/solution/samples/xmpsample.vcxproj | 54 +-- contrib/vs2019/solution/src/exiv2.vcxproj | 70 ++-- contrib/vs2019/solution/src/exiv2lib.vcxproj | 214 +++++----- .../vs2019/solution/src/exiv2lib_int.vcxproj | 130 +++---- .../solution/unitTests/unit_tests.vcxproj | 364 +++++++++--------- .../vs2019/solution/xmpsdk/exiv2-xmp.vcxproj | 82 ++-- 44 files changed, 1424 insertions(+), 1424 deletions(-) diff --git a/contrib/vs2019/LICENSE b/contrib/vs2019/LICENSE index 412a0068..a58147e8 100644 --- a/contrib/vs2019/LICENSE +++ b/contrib/vs2019/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Sridhar Boovaraghavan GitHub Handle: sridharb1 +Copyright (c) 2020 Sridhar Boovaraghavan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/contrib/vs2019/README.md b/contrib/vs2019/README.md index 54252e69..d122e8ac 100644 --- a/contrib/vs2019/README.md +++ b/contrib/vs2019/README.md @@ -84,9 +84,9 @@ heirarchy and compile correctly. # Sources # * [Exiv2, tested w/ v0.27.2](https://github.com/Exiv2/exiv2) - * Use my [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to -compile on Windows - * Place the contents of exiv2-x86_x64 in a folder called build in the exiv2 repository and build using the provided solution. Please note that the dependencies listed below are needed. + * In v0.27.3, my solution/project files can be found in contrib/vs2019/solution + * For other versions, use my [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to compile on Windows + * Place the contents of exiv2-x86_x64 in a folder called contrib/vs2019/solution in the exiv2 repository and build using the provided solution. Please note that the dependencies listed below are needed. * `exiv2 -vV` ``` shell diff --git a/contrib/vs2019/solution/exiv2.sln b/contrib/vs2019/solution/exiv2.sln index 9ea1e4d6..664064e7 100644 --- a/contrib/vs2019/solution/exiv2.sln +++ b/contrib/vs2019/solution/exiv2.sln @@ -246,46 +246,46 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External Dependencies", "Ex EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zlib", "zlib", "{C1530683-7B22-4711-A28D-EB85D6EB4341}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\..\zlib\contrib\vstudio\vc14\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libexpat", "libexpat", "{ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\libexpat\expat\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\..\..\libexpat\expat\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "googletest", "googletest", "{F663E319-59FD-4078-9523-C12E27C3D861}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\googletest\build\googletest\gtest.vcxproj", "{95E9B845-09D7-3453-AEEB-2E1005096E32}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\..\..\googletest\build\googletest\gtest.vcxproj", "{95E9B845-09D7-3453-AEEB-2E1005096E32}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\..\googletest\build\googletest\gtest_main.vcxproj", "{DB773438-551F-38FA-8D50-D0261199236B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\..\..\..\googletest\build\googletest\gtest_main.vcxproj", "{DB773438-551F-38FA-8D50-D0261199236B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "openssl", "openssl", "{CB91FB25-735F-47E6-B03F-07E399A71DF0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_prebuild", "..\..\openssl\build\_prebuild\_prebuild.vcxproj", "{625D49F1-BC00-4C36-AE25-2F408B208B08}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_prebuild", "..\..\..\..\openssl\build\_prebuild\_prebuild.vcxproj", "{625D49F1-BC00-4C36-AE25-2F408B208B08}" ProjectSection(ProjectDependencies) = postProject {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto-1_1", "..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj", "{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcrypto-1_1", "..\..\..\..\openssl\build\libcrypto-1_1\libcrypto-1_1.vcxproj", "{C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C}" ProjectSection(ProjectDependencies) = postProject {625D49F1-BC00-4C36-AE25-2F408B208B08} = {625D49F1-BC00-4C36-AE25-2F408B208B08} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssl-1_1", "..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj", "{1E068827-5CD6-4648-98DD-B0417F0B9DDC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssl-1_1", "..\..\..\..\openssl\build\libssl-1_1\libssl-1_1.vcxproj", "{1E068827-5CD6-4648-98DD-B0417F0B9DDC}" ProjectSection(ProjectDependencies) = postProject {625D49F1-BC00-4C36-AE25-2F408B208B08} = {625D49F1-BC00-4C36-AE25-2F408B208B08} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libiconv", "libiconv", "{2B87527C-BFD7-4052-AACA-56D6FAE909F2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\libiconv\libiconv.vcxproj", "{1704EA01-6B21-4362-9F1F-44D25CF2E0D7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\..\..\libiconv\libiconv.vcxproj", "{1704EA01-6B21-4362-9F1F-44D25CF2E0D7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libssh", "libssh", "{A7FEA0DE-61D3-4581-BA4F-C8AC0696B253}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "..\..\libssh\build\src\ssh.vcxproj", "{0AA428D8-E6A8-3A36-9045-621F4DDE3043}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh", "..\..\..\..\libssh\build\src\ssh.vcxproj", "{0AA428D8-E6A8-3A36-9045-621F4DDE3043}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libssh2", "libssh2", "{7B332138-E8B9-4ED5-AB7C-F1F882756BD5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\libssh2\build\src\libssh2.vcxproj", "{127DC9DE-814F-312C-8F30-4FE281393B38}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\..\..\libssh2\build\src\libssh2.vcxproj", "{127DC9DE-814F-312C-8F30-4FE281393B38}" ProjectSection(ProjectDependencies) = postProject {1E068827-5CD6-4648-98DD-B0417F0B9DDC} = {1E068827-5CD6-4648-98DD-B0417F0B9DDC} {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} = {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} @@ -294,7 +294,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\..\libssh2\bu EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "curl", "curl", "{968769AE-15C0-4515-8DF2-8AD839A91A7F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\..\..\curl\projects\Windows\VC15\lib\libcurl.vcxproj", "{DA6F56B4-06A4-441D-AD70-AC5A7D51FADB}" ProjectSection(ProjectDependencies) = postProject {1E068827-5CD6-4648-98DD-B0417F0B9DDC} = {1E068827-5CD6-4648-98DD-B0417F0B9DDC} {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} = {C92E1E46-3C94-4DD6-8E7D-E23ECED32A8C} @@ -304,7 +304,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcurl", "..\..\curl\proje EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libintl", "libintl", "{26B736E5-4188-428A-B802-0F6089EC3F86}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libintl_static", "..\..\gettext\build\gettext\libintl_static.vcxproj", "{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libintl_static", "..\..\..\..\gettext\build\gettext\libintl_static.vcxproj", "{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/contrib/vs2019/solution/samples/addmoddel.vcxproj b/contrib/vs2019/solution/samples/addmoddel.vcxproj index dff0aa15..c3c4f161 100644 --- a/contrib/vs2019/solution/samples/addmoddel.vcxproj +++ b/contrib/vs2019/solution/samples/addmoddel.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/conntest.vcxproj b/contrib/vs2019/solution/samples/conntest.vcxproj index 4ea500cd..f2b9bdde 100644 --- a/contrib/vs2019/solution/samples/conntest.vcxproj +++ b/contrib/vs2019/solution/samples/conntest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/convert-test.vcxproj b/contrib/vs2019/solution/samples/convert-test.vcxproj index dc3dd06f..e84f0bdf 100644 --- a/contrib/vs2019/solution/samples/convert-test.vcxproj +++ b/contrib/vs2019/solution/samples/convert-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/easyaccess-test.vcxproj b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj index 61312024..72e1fffa 100644 --- a/contrib/vs2019/solution/samples/easyaccess-test.vcxproj +++ b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exifcomment.vcxproj b/contrib/vs2019/solution/samples/exifcomment.vcxproj index 1a76deb4..fcdef5b0 100644 --- a/contrib/vs2019/solution/samples/exifcomment.vcxproj +++ b/contrib/vs2019/solution/samples/exifcomment.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exifdata-test.vcxproj b/contrib/vs2019/solution/samples/exifdata-test.vcxproj index 8d29d241..269fee1b 100644 --- a/contrib/vs2019/solution/samples/exifdata-test.vcxproj +++ b/contrib/vs2019/solution/samples/exifdata-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exifdata.vcxproj b/contrib/vs2019/solution/samples/exifdata.vcxproj index a7c1a906..3d4189ec 100644 --- a/contrib/vs2019/solution/samples/exifdata.vcxproj +++ b/contrib/vs2019/solution/samples/exifdata.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exifprint.vcxproj b/contrib/vs2019/solution/samples/exifprint.vcxproj index 4dbbb086..eac6e518 100644 --- a/contrib/vs2019/solution/samples/exifprint.vcxproj +++ b/contrib/vs2019/solution/samples/exifprint.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exifvalue.vcxproj b/contrib/vs2019/solution/samples/exifvalue.vcxproj index 219c52af..f7124ef8 100644 --- a/contrib/vs2019/solution/samples/exifvalue.vcxproj +++ b/contrib/vs2019/solution/samples/exifvalue.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/exiv2json.vcxproj b/contrib/vs2019/solution/samples/exiv2json.vcxproj index 49b67a11..5c6d3fce 100644 --- a/contrib/vs2019/solution/samples/exiv2json.vcxproj +++ b/contrib/vs2019/solution/samples/exiv2json.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,43 +235,43 @@ - - - + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/geotag.vcxproj b/contrib/vs2019/solution/samples/geotag.vcxproj index e6c9a74b..51c476eb 100644 --- a/contrib/vs2019/solution/samples/geotag.vcxproj +++ b/contrib/vs2019/solution/samples/geotag.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;XML_STATIC;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/getopt-test.vcxproj b/contrib/vs2019/solution/samples/getopt-test.vcxproj index c29b3889..cce3bc13 100644 --- a/contrib/vs2019/solution/samples/getopt-test.vcxproj +++ b/contrib/vs2019/solution/samples/getopt-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,43 +235,43 @@ - - - + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/ini-test.vcxproj b/contrib/vs2019/solution/samples/ini-test.vcxproj index d0505932..31c2ebab 100644 --- a/contrib/vs2019/solution/samples/ini-test.vcxproj +++ b/contrib/vs2019/solution/samples/ini-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/iotest.vcxproj b/contrib/vs2019/solution/samples/iotest.vcxproj index 06784759..109520a2 100644 --- a/contrib/vs2019/solution/samples/iotest.vcxproj +++ b/contrib/vs2019/solution/samples/iotest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/iptceasy.vcxproj b/contrib/vs2019/solution/samples/iptceasy.vcxproj index 6d83d733..f49d04b6 100644 --- a/contrib/vs2019/solution/samples/iptceasy.vcxproj +++ b/contrib/vs2019/solution/samples/iptceasy.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/iptcprint.vcxproj b/contrib/vs2019/solution/samples/iptcprint.vcxproj index e694c1f9..2566c2ec 100644 --- a/contrib/vs2019/solution/samples/iptcprint.vcxproj +++ b/contrib/vs2019/solution/samples/iptcprint.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/iptctest.vcxproj b/contrib/vs2019/solution/samples/iptctest.vcxproj index ea9351e0..180ff58d 100644 --- a/contrib/vs2019/solution/samples/iptctest.vcxproj +++ b/contrib/vs2019/solution/samples/iptctest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/key-test.vcxproj b/contrib/vs2019/solution/samples/key-test.vcxproj index 074d884c..3c384b87 100644 --- a/contrib/vs2019/solution/samples/key-test.vcxproj +++ b/contrib/vs2019/solution/samples/key-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/largeiptc-test.vcxproj b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj index ac068ac1..0f6c2f19 100644 --- a/contrib/vs2019/solution/samples/largeiptc-test.vcxproj +++ b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/metacopy.vcxproj b/contrib/vs2019/solution/samples/metacopy.vcxproj index 644667b6..ffc7c42d 100644 --- a/contrib/vs2019/solution/samples/metacopy.vcxproj +++ b/contrib/vs2019/solution/samples/metacopy.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,43 +235,43 @@ - - - + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/mmap-test.vcxproj b/contrib/vs2019/solution/samples/mmap-test.vcxproj index 14020db6..ff603e60 100644 --- a/contrib/vs2019/solution/samples/mmap-test.vcxproj +++ b/contrib/vs2019/solution/samples/mmap-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/mrwthumb.vcxproj b/contrib/vs2019/solution/samples/mrwthumb.vcxproj index 0f2f4461..da275b6e 100644 --- a/contrib/vs2019/solution/samples/mrwthumb.vcxproj +++ b/contrib/vs2019/solution/samples/mrwthumb.vcxproj @@ -1,4 +1,4 @@ - + x64 @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,10 +100,10 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,10 +139,10 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,10 +177,10 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,10 +215,10 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(ProjectDir)/$(IntDir) %(Filename).h %(Filename).tlb @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib @@ -277,4 +277,4 @@ - + \ No newline at end of file diff --git a/contrib/vs2019/solution/samples/pathtest.vcxproj b/contrib/vs2019/solution/samples/pathtest.vcxproj index 82611c30..c2cfe9be 100644 --- a/contrib/vs2019/solution/samples/pathtest.vcxproj +++ b/contrib/vs2019/solution/samples/pathtest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,43 +235,43 @@ - - - + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/prevtest.vcxproj b/contrib/vs2019/solution/samples/prevtest.vcxproj index 8c6326d6..1f186af0 100644 --- a/contrib/vs2019/solution/samples/prevtest.vcxproj +++ b/contrib/vs2019/solution/samples/prevtest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/remotetest.vcxproj b/contrib/vs2019/solution/samples/remotetest.vcxproj index c1a4ea4a..0b1021dd 100644 --- a/contrib/vs2019/solution/samples/remotetest.vcxproj +++ b/contrib/vs2019/solution/samples/remotetest.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/stringto-test.vcxproj b/contrib/vs2019/solution/samples/stringto-test.vcxproj index 852bbee8..9dc09320 100644 --- a/contrib/vs2019/solution/samples/stringto-test.vcxproj +++ b/contrib/vs2019/solution/samples/stringto-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/taglist.vcxproj b/contrib/vs2019/solution/samples/taglist.vcxproj index 30aa5c61..36515475 100644 --- a/contrib/vs2019/solution/samples/taglist.vcxproj +++ b/contrib/vs2019/solution/samples/taglist.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/tiff-test.vcxproj b/contrib/vs2019/solution/samples/tiff-test.vcxproj index b6d989f9..0e88e326 100644 --- a/contrib/vs2019/solution/samples/tiff-test.vcxproj +++ b/contrib/vs2019/solution/samples/tiff-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/werror-test.vcxproj b/contrib/vs2019/solution/samples/werror-test.vcxproj index 7906f768..98fda928 100644 --- a/contrib/vs2019/solution/samples/werror-test.vcxproj +++ b/contrib/vs2019/solution/samples/werror-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/write-test.vcxproj b/contrib/vs2019/solution/samples/write-test.vcxproj index d9bf4d97..ee5ad282 100644 --- a/contrib/vs2019/solution/samples/write-test.vcxproj +++ b/contrib/vs2019/solution/samples/write-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/write2-test.vcxproj b/contrib/vs2019/solution/samples/write2-test.vcxproj index 5839e168..0434e966 100644 --- a/contrib/vs2019/solution/samples/write2-test.vcxproj +++ b/contrib/vs2019/solution/samples/write2-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/xmpdump.vcxproj b/contrib/vs2019/solution/samples/xmpdump.vcxproj index 94aff738..fe995df4 100644 --- a/contrib/vs2019/solution/samples/xmpdump.vcxproj +++ b/contrib/vs2019/solution/samples/xmpdump.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/xmpparse.vcxproj b/contrib/vs2019/solution/samples/xmpparse.vcxproj index 309227dd..be3d095d 100644 --- a/contrib/vs2019/solution/samples/xmpparse.vcxproj +++ b/contrib/vs2019/solution/samples/xmpparse.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/xmpparser-test.vcxproj b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj index 62b7e32c..54d56b1e 100644 --- a/contrib/vs2019/solution/samples/xmpparser-test.vcxproj +++ b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/xmpprint.vcxproj b/contrib/vs2019/solution/samples/xmpprint.vcxproj index 2c82503f..ece23d44 100644 --- a/contrib/vs2019/solution/samples/xmpprint.vcxproj +++ b/contrib/vs2019/solution/samples/xmpprint.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/samples/xmpsample.vcxproj b/contrib/vs2019/solution/samples/xmpsample.vcxproj index 8e551e3a..9c51b95f 100644 --- a/contrib/vs2019/solution/samples/xmpsample.vcxproj +++ b/contrib/vs2019/solution/samples/xmpsample.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -100,11 +100,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -121,7 +121,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -139,11 +139,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -160,7 +160,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -177,11 +177,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -198,7 +198,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -215,11 +215,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -235,41 +235,41 @@ - + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/src/exiv2.vcxproj b/contrib/vs2019/solution/src/exiv2.vcxproj index b485ed46..552af7cd 100644 --- a/contrib/vs2019/solution/src/exiv2.vcxproj +++ b/contrib/vs2019/solution/src/exiv2.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -99,11 +99,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -120,7 +120,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -137,11 +137,11 @@ WIN32;_DEBUG;_WINDOWS;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -158,7 +158,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -174,11 +174,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -195,7 +195,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -211,11 +211,11 @@ WIN32;_WINDOWS;NDEBUG;NOMINMAX;WIN32_LEAN_AND_MEAN;EXV_LOCALEDIR=\"/../share/locale\";CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -231,48 +231,48 @@ - - - - - - - - + + + + + + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {1704ea01-6b21-4362-9f1f-44d25cf2e0d7} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp - + {8F05B0E7-6D03-3F78-A470-0E20BF6C6191} exiv2lib diff --git a/contrib/vs2019/solution/src/exiv2lib.vcxproj b/contrib/vs2019/solution/src/exiv2lib.vcxproj index 75829b0c..f0bea51a 100644 --- a/contrib/vs2019/solution/src/exiv2lib.vcxproj +++ b/contrib/vs2019/solution/src/exiv2lib.vcxproj @@ -78,7 +78,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -95,11 +95,11 @@ WIN32;_DEBUG;_WINDOWS;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -109,7 +109,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -126,11 +126,11 @@ WIN32;_DEBUG;_WINDOWS;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -140,7 +140,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -156,11 +156,11 @@ WIN32;_WINDOWS;NDEBUG;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -170,7 +170,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -186,11 +186,11 @@ WIN32;_WINDOWS;NDEBUG;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -199,97 +199,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/vs2019/solution/src/exiv2lib_int.vcxproj b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj index c726651b..3cafa214 100644 --- a/contrib/vs2019/solution/src/exiv2lib_int.vcxproj +++ b/contrib/vs2019/solution/src/exiv2lib_int.vcxproj @@ -78,7 +78,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -95,11 +95,11 @@ WIN32;_DEBUG;_WINDOWS;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -109,7 +109,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -126,11 +126,11 @@ WIN32;_DEBUG;_WINDOWS;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -140,7 +140,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -156,11 +156,11 @@ WIN32;_WINDOWS;NDEBUG;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -170,7 +170,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -186,11 +186,11 @@ WIN32;_WINDOWS;NDEBUG;exiv2lib_EXPORTS;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -199,55 +199,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/vs2019/solution/unitTests/unit_tests.vcxproj b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj index 989f7b68..449c2f7e 100644 --- a/contrib/vs2019/solution/unitTests/unit_tests.vcxproj +++ b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj @@ -82,7 +82,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -101,11 +101,11 @@ WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -122,7 +122,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) $(IntDir) EnableFastChecks CompileAsCpp @@ -141,11 +141,11 @@ WIN32;_DEBUG;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -162,7 +162,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -180,11 +180,11 @@ WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -201,7 +201,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;$(ProjectDir)..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\libiconv\include;$(ProjectDir)..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\zlib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;$(ProjectDir)..\..\..\..\..\googletest\googletest\include;$(ProjectDir)..\..\..\..\..\libiconv\include;$(ProjectDir)..\..\..\..\..\gettext\build\gettext;$(ProjectDir)..\..\..\..\..\zlib;%(AdditionalIncludeDirectories) $(IntDir) CompileAsCpp Sync @@ -219,11 +219,11 @@ WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR=\"/../share/locale\";GTEST_LINKED_AS_SHARED_LIBRARY=1;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\src;$(ProjectDir)..\..\include\exiv2;$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\curl\include;$(ProjectDir)..\..\src;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libssh\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\include\exiv2;$(ProjectDir)..\..\..\..\include;$(ProjectDir)..\..\..\..\..\curl\include;$(ProjectDir)..\..\..\..\src;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libssh\include;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -239,197 +239,197 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} - + {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {95e9b845-09d7-3453-aeeb-2e1005096e32} - + {db773438-551f-38fa-8d50-d0261199236b} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} - + {127dc9de-814f-312c-8f30-4fe281393b38} - + {0aa428d8-e6a8-3a36-9045-621f4dde3043} - + {c92e1e46-3c94-4dd6-8e7d-e23eced32a8c} - + {1e068827-5cd6-4648-98dd-b0417f0b9ddc} - + {745dec58-ebb3-47a9-a9b8-4c6627c01bf8} {15d4cbe5-4f35-3280-9747-7c4c0fabe386} - + {D1483131-BF1B-37C3-B1C8-A6FB8235195B} exiv2-xmp diff --git a/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj index ce31564f..4765b9b3 100644 --- a/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj +++ b/contrib/vs2019/solution/xmpsdk/exiv2-xmp.vcxproj @@ -78,7 +78,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -95,11 +95,11 @@ WIN32;_DEBUG;_WINDOWS;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -109,7 +109,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) EnableFastChecks CompileAsCpp ProgramDatabase @@ -126,11 +126,11 @@ WIN32;_DEBUG;_WINDOWS;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -140,7 +140,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -156,11 +156,11 @@ WIN32;_WINDOWS;NDEBUG;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -170,7 +170,7 @@ - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) CompileAsCpp Sync true @@ -186,11 +186,11 @@ WIN32;_WINDOWS;NDEBUG;BanAllEntityUsage=1;XML_STATIC;EXV_HAVE_STDINT_H;NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)..\;$(ProjectDir)..\..\xmpsdk\include;$(ProjectDir)..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) + $(ProjectDir)..\;$(ProjectDir)..\..\..\..\xmpsdk\include;$(ProjectDir)..\..\..\..\..\libexpat\expat\lib;%(AdditionalIncludeDirectories) + $(IntDir) %(Filename).h %(Filename).tlb %(Filename)_i.c @@ -199,31 +199,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + From 01ec6d44e2732f213070b6ad896e80404088c13f Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 5 Apr 2020 11:51:53 +0100 Subject: [PATCH 03/13] Fixing "lost" change. --- contrib/vs2019/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/vs2019/LICENSE b/contrib/vs2019/LICENSE index a58147e8..81fe56ef 100644 --- a/contrib/vs2019/LICENSE +++ b/contrib/vs2019/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Sridhar Boovaraghavan +Copyright (c) 2020 Sridhar Boovaraghavan GitHub Handle: sridharb1 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 8b6c70e0f2b07fce1d8e56836494c075c9aebf54 Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 6 Apr 2020 08:18:29 +0100 Subject: [PATCH 04/13] https://github.com/Exiv2/exiv2/pull/1134#issuecomment-609606563 --- contrib/vs2019/README.md | 15 +-- contrib/vs2019/solution/exiv2.sln | 98 +++++++++++++++---- .../vs2019/solution/samples/addmoddel.vcxproj | 11 ++- .../vs2019/solution/samples/conntest.vcxproj | 12 ++- .../solution/samples/conntest.vcxproj.filters | 4 +- .../solution/samples/convert-test.vcxproj | 11 ++- .../solution/samples/easyaccess-test.vcxproj | 11 ++- .../solution/samples/exifcomment.vcxproj | 11 ++- .../solution/samples/exifdata-test.vcxproj | 11 ++- .../vs2019/solution/samples/exifdata.vcxproj | 11 ++- .../vs2019/solution/samples/exifprint.vcxproj | 11 ++- .../vs2019/solution/samples/exifvalue.vcxproj | 11 ++- .../vs2019/solution/samples/exiv2json.vcxproj | 11 ++- .../vs2019/solution/samples/geotag.vcxproj | 11 ++- .../solution/samples/getopt-test.vcxproj | 11 ++- .../vs2019/solution/samples/ini-test.vcxproj | 11 ++- .../vs2019/solution/samples/iotest.vcxproj | 11 ++- .../solution/samples/iotest.vcxproj.filters | 4 +- .../vs2019/solution/samples/iptceasy.vcxproj | 11 ++- .../vs2019/solution/samples/iptcprint.vcxproj | 11 ++- .../vs2019/solution/samples/iptctest.vcxproj | 11 ++- .../vs2019/solution/samples/key-test.vcxproj | 11 ++- .../solution/samples/largeiptc-test.vcxproj | 11 ++- .../vs2019/solution/samples/metacopy.vcxproj | 11 ++- .../vs2019/solution/samples/mmap-test.vcxproj | 11 ++- .../vs2019/solution/samples/mrwthumb.vcxproj | 11 ++- .../vs2019/solution/samples/pathtest.vcxproj | 11 ++- .../vs2019/solution/samples/prevtest.vcxproj | 11 ++- .../solution/samples/remotetest.vcxproj | 11 ++- .../solution/samples/stringto-test.vcxproj | 11 ++- .../vs2019/solution/samples/taglist.vcxproj | 11 ++- .../vs2019/solution/samples/tiff-test.vcxproj | 11 ++- .../solution/samples/werror-test.vcxproj | 11 ++- .../solution/samples/write-test.vcxproj | 11 ++- .../solution/samples/write2-test.vcxproj | 11 ++- .../vs2019/solution/samples/xmpdump.vcxproj | 11 ++- .../vs2019/solution/samples/xmpparse.vcxproj | 11 ++- .../solution/samples/xmpparser-test.vcxproj | 11 ++- .../vs2019/solution/samples/xmpprint.vcxproj | 11 ++- .../vs2019/solution/samples/xmpsample.vcxproj | 11 ++- contrib/vs2019/solution/src/exiv2.vcxproj | 11 ++- .../solution/unitTests/unit_tests.vcxproj | 11 ++- 42 files changed, 469 insertions(+), 71 deletions(-) diff --git a/contrib/vs2019/README.md b/contrib/vs2019/README.md index d122e8ac..327629c4 100644 --- a/contrib/vs2019/README.md +++ b/contrib/vs2019/README.md @@ -91,7 +91,7 @@ heirarchy and compile correctly. ``` shell exiv2 0.27.2 - + This program 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 @@ -114,14 +114,14 @@ heirarchy and compile correctly. debug=0 cplusplus=199711 version=13.25 (2017/x64) - date=Mar 21 2020 - time=16:28:02 - processpath=E:\Projects\exiv2\build\src\x64\Release + date=Apr 6 2020 + time=11:28:24 + processpath=E:\My Projects\exiv2\contrib\vs2019\solution\src\x64\Release localedir=/../share/locale package_name=exiv2 curlprotocols=dict file ftp ftps gopher http https imap imaps ldap ldaps pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp curl=1 - executable=E:\Projects\exiv2\build\src\x64\Release\exiv2.exe + executable=E:\Projects\exiv2\contrib\vs2019\solution\src\x64\Release\exiv2.exe library=C:\WINDOWS\SYSTEM32\ntdll.dll library=C:\Program Files\AVAST Software\Avast\aswhook.dll library=C:\WINDOWS\System32\KERNEL32.DLL @@ -256,13 +256,14 @@ heirarchy and compile correctly. * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com)[^2] * [NASM, used 2.14.02 x64](https://www.nasm.us/)[^3] * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat)[^4] - * [OpenSSL, tested w/ v1.1.1e-DEV](https://github.com/openssl/openssl)[^5] + * [OpenSSL, tested w/ v1.1.1g-DEV](https://github.com/openssl/openssl)[^5] * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git)[^6] * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git)[^7] * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8] * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git)[^9] * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64) * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)[^10] + * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli)[^11] * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/) [^1]: It has since been killed by google. (You can find the last released version here: [Picasa 3.9.141, build 259](https://1drv.ms/u/s!AuE8ZYzPkfMfiEzdlKtVVjN-MReT)) @@ -288,3 +289,5 @@ compile on Windows using Visual Studio [^9]: Use my [gettext-x86_x64](https://github.com/sridharb1/gettext-x86_x64) to compile on Windows using Visual Studio [^10]: Use my [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git) to compile on Windows using Visual Studio + +[^11]: Use my [brotli-x86_x64](https://github.com/sridharb1/brotli-x86_x64)to compile on Windows using Visual Studio diff --git a/contrib/vs2019/solution/exiv2.sln b/contrib/vs2019/solution/exiv2.sln index 664064e7..96b19b04 100644 --- a/contrib/vs2019/solution/exiv2.sln +++ b/contrib/vs2019/solution/exiv2.sln @@ -250,8 +250,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\..\..\..\zli EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libexpat", "libexpat", "{ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\..\..\libexpat\expat\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "googletest", "googletest", "{F663E319-59FD-4078-9523-C12E27C3D861}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\..\..\..\googletest\build\googletest\gtest.vcxproj", "{95E9B845-09D7-3453-AEEB-2E1005096E32}" @@ -306,6 +304,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libintl", "libintl", "{26B7 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libintl_static", "..\..\..\..\gettext\build\gettext\libintl_static.vcxproj", "{B8B3B620-FC06-47D0-9D92-BD5CBA448D84}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "..\..\..\..\libexpat\build\lib\expat_static.vcxproj", "{58A821BC-E4AF-4DF4-9A54-2BAA22B92615}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "brotli", "brotli", "{7D220911-7585-4C99-A8A5-D4D95FA9D817}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlicommon-static", "..\..\..\..\brotli\build_folder\brotlicommon-static.vcxproj", "{39ABFC9D-42B2-3E32-866B-EC2B980BF85C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlidec-static", "..\..\..\..\brotli\build_folder\brotlidec-static.vcxproj", "{E279DD40-3CAC-3030-875B-28B50015788D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "brotlienc-static", "..\..\..\..\brotli\build_folder\brotlienc-static.vcxproj", "{2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -990,22 +998,6 @@ Global {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|Win32.Build.0 = Release|Win32 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|x64.ActiveCfg = Release|x64 {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Template|x64.Build.0 = Release|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.ActiveCfg = Debug|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.Build.0 = Debug|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.ActiveCfg = Debug|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.Build.0 = Debug|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.ActiveCfg = Release|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.Build.0 = Release|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.ActiveCfg = Release|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.Build.0 = Release|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.ActiveCfg = Template|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.Build.0 = Template|Win32 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.ActiveCfg = Template|x64 - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.Build.0 = Template|x64 {95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|Win32.ActiveCfg = Debug|Win32 {95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|Win32.Build.0 = Debug|Win32 {95E9B845-09D7-3453-AEEB-2E1005096E32}.Debug|x64.ActiveCfg = Debug|x64 @@ -1166,6 +1158,70 @@ Global {B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|Win32.Build.0 = Release|Win32 {B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|x64.ActiveCfg = Release|x64 {B8B3B620-FC06-47D0-9D92-BD5CBA448D84}.Template|x64.Build.0 = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.ActiveCfg = Debug|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|Win32.Build.0 = Debug|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.ActiveCfg = Debug|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Debug|x64.Build.0 = Debug|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.ActiveCfg = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|Win32.Build.0 = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.ActiveCfg = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Release|x64.Build.0 = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.ActiveCfg = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|Win32.Build.0 = Release|Win32 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.ActiveCfg = Release|x64 + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615}.Template|x64.Build.0 = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|Win32.ActiveCfg = Debug|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|Win32.Build.0 = Debug|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|x64.ActiveCfg = Debug|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Debug|x64.Build.0 = Debug|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|Win32.ActiveCfg = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|Win32.Build.0 = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|x64.ActiveCfg = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Release|x64.Build.0 = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|Win32.ActiveCfg = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|Win32.Build.0 = Release|Win32 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|x64.ActiveCfg = Release|x64 + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C}.Template|x64.Build.0 = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Debug|Win32.ActiveCfg = Debug|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Debug|Win32.Build.0 = Debug|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Debug|x64.ActiveCfg = Debug|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Debug|x64.Build.0 = Debug|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Release|Win32.ActiveCfg = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Release|Win32.Build.0 = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Release|x64.ActiveCfg = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Release|x64.Build.0 = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Template|Win32.ActiveCfg = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Template|Win32.Build.0 = Release|Win32 + {E279DD40-3CAC-3030-875B-28B50015788D}.Template|x64.ActiveCfg = Release|x64 + {E279DD40-3CAC-3030-875B-28B50015788D}.Template|x64.Build.0 = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|Win32.ActiveCfg = Debug|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|Win32.Build.0 = Debug|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|x64.ActiveCfg = Debug|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Debug|x64.Build.0 = Debug|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|Win32.ActiveCfg = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|Win32.Build.0 = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|x64.ActiveCfg = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Release|x64.Build.0 = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|Win32.ActiveCfg = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|Win32.Build.0 = Release|Win32 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|x64.ActiveCfg = Release|x64 + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41}.Template|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1211,7 +1267,6 @@ Global {C1530683-7B22-4711-A28D-EB85D6EB4341} = {4B90B8DD-9956-4545-BD02-651E72E952DB} {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {C1530683-7B22-4711-A28D-EB85D6EB4341} {ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22} = {4B90B8DD-9956-4545-BD02-651E72E952DB} - {58A821BC-E4AF-4DF4-9A54-2BAA22B92615} = {ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22} {F663E319-59FD-4078-9523-C12E27C3D861} = {4B90B8DD-9956-4545-BD02-651E72E952DB} {95E9B845-09D7-3453-AEEB-2E1005096E32} = {F663E319-59FD-4078-9523-C12E27C3D861} {DB773438-551F-38FA-8D50-D0261199236B} = {F663E319-59FD-4078-9523-C12E27C3D861} @@ -1229,6 +1284,11 @@ Global {DA6F56B4-06A4-441D-AD70-AC5A7D51FADB} = {968769AE-15C0-4515-8DF2-8AD839A91A7F} {26B736E5-4188-428A-B802-0F6089EC3F86} = {4B90B8DD-9956-4545-BD02-651E72E952DB} {B8B3B620-FC06-47D0-9D92-BD5CBA448D84} = {26B736E5-4188-428A-B802-0F6089EC3F86} + {58A821BC-E4AF-4DF4-9A54-2BAA22B92615} = {ED774129-9AF5-4BD4-9EE5-45DA2A3E0D22} + {7D220911-7585-4C99-A8A5-D4D95FA9D817} = {4B90B8DD-9956-4545-BD02-651E72E952DB} + {39ABFC9D-42B2-3E32-866B-EC2B980BF85C} = {7D220911-7585-4C99-A8A5-D4D95FA9D817} + {E279DD40-3CAC-3030-875B-28B50015788D} = {7D220911-7585-4C99-A8A5-D4D95FA9D817} + {2FFFA03D-A47C-3AEB-A9E9-611FE2DBBA41} = {7D220911-7585-4C99-A8A5-D4D95FA9D817} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7A63A651-A83B-3F94-B0B1-6505EABB85A4} diff --git a/contrib/vs2019/solution/samples/addmoddel.vcxproj b/contrib/vs2019/solution/samples/addmoddel.vcxproj index c3c4f161..cb2ef869 100644 --- a/contrib/vs2019/solution/samples/addmoddel.vcxproj +++ b/contrib/vs2019/solution/samples/addmoddel.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/conntest.vcxproj b/contrib/vs2019/solution/samples/conntest.vcxproj index f2b9bdde..50ffeae9 100644 --- a/contrib/vs2019/solution/samples/conntest.vcxproj +++ b/contrib/vs2019/solution/samples/conntest.vcxproj @@ -238,15 +238,21 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - - {58a821bc-e4af-4df4-9a54-2baa22b92615} - {127dc9de-814f-312c-8f30-4fe281393b38} diff --git a/contrib/vs2019/solution/samples/conntest.vcxproj.filters b/contrib/vs2019/solution/samples/conntest.vcxproj.filters index bf345d88..c886facc 100644 --- a/contrib/vs2019/solution/samples/conntest.vcxproj.filters +++ b/contrib/vs2019/solution/samples/conntest.vcxproj.filters @@ -1,9 +1,7 @@  - - Source Files - + diff --git a/contrib/vs2019/solution/samples/convert-test.vcxproj b/contrib/vs2019/solution/samples/convert-test.vcxproj index e84f0bdf..ccf62a97 100644 --- a/contrib/vs2019/solution/samples/convert-test.vcxproj +++ b/contrib/vs2019/solution/samples/convert-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/easyaccess-test.vcxproj b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj index 72e1fffa..ee553c9b 100644 --- a/contrib/vs2019/solution/samples/easyaccess-test.vcxproj +++ b/contrib/vs2019/solution/samples/easyaccess-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exifcomment.vcxproj b/contrib/vs2019/solution/samples/exifcomment.vcxproj index fcdef5b0..4e69f889 100644 --- a/contrib/vs2019/solution/samples/exifcomment.vcxproj +++ b/contrib/vs2019/solution/samples/exifcomment.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exifdata-test.vcxproj b/contrib/vs2019/solution/samples/exifdata-test.vcxproj index 269fee1b..5f522f9b 100644 --- a/contrib/vs2019/solution/samples/exifdata-test.vcxproj +++ b/contrib/vs2019/solution/samples/exifdata-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exifdata.vcxproj b/contrib/vs2019/solution/samples/exifdata.vcxproj index 3d4189ec..37d7ea4f 100644 --- a/contrib/vs2019/solution/samples/exifdata.vcxproj +++ b/contrib/vs2019/solution/samples/exifdata.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exifprint.vcxproj b/contrib/vs2019/solution/samples/exifprint.vcxproj index eac6e518..d025f7be 100644 --- a/contrib/vs2019/solution/samples/exifprint.vcxproj +++ b/contrib/vs2019/solution/samples/exifprint.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exifvalue.vcxproj b/contrib/vs2019/solution/samples/exifvalue.vcxproj index f7124ef8..9d0963b4 100644 --- a/contrib/vs2019/solution/samples/exifvalue.vcxproj +++ b/contrib/vs2019/solution/samples/exifvalue.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/exiv2json.vcxproj b/contrib/vs2019/solution/samples/exiv2json.vcxproj index 5c6d3fce..b219e2df 100644 --- a/contrib/vs2019/solution/samples/exiv2json.vcxproj +++ b/contrib/vs2019/solution/samples/exiv2json.vcxproj @@ -240,13 +240,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/geotag.vcxproj b/contrib/vs2019/solution/samples/geotag.vcxproj index 51c476eb..50f75752 100644 --- a/contrib/vs2019/solution/samples/geotag.vcxproj +++ b/contrib/vs2019/solution/samples/geotag.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/getopt-test.vcxproj b/contrib/vs2019/solution/samples/getopt-test.vcxproj index cce3bc13..d179d2f8 100644 --- a/contrib/vs2019/solution/samples/getopt-test.vcxproj +++ b/contrib/vs2019/solution/samples/getopt-test.vcxproj @@ -240,13 +240,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/ini-test.vcxproj b/contrib/vs2019/solution/samples/ini-test.vcxproj index 31c2ebab..e30d586d 100644 --- a/contrib/vs2019/solution/samples/ini-test.vcxproj +++ b/contrib/vs2019/solution/samples/ini-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/iotest.vcxproj b/contrib/vs2019/solution/samples/iotest.vcxproj index 109520a2..8b952544 100644 --- a/contrib/vs2019/solution/samples/iotest.vcxproj +++ b/contrib/vs2019/solution/samples/iotest.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/iotest.vcxproj.filters b/contrib/vs2019/solution/samples/iotest.vcxproj.filters index 8cac8d0c..25fdaa79 100644 --- a/contrib/vs2019/solution/samples/iotest.vcxproj.filters +++ b/contrib/vs2019/solution/samples/iotest.vcxproj.filters @@ -1,9 +1,7 @@  - - Source Files - + diff --git a/contrib/vs2019/solution/samples/iptceasy.vcxproj b/contrib/vs2019/solution/samples/iptceasy.vcxproj index f49d04b6..e64b5deb 100644 --- a/contrib/vs2019/solution/samples/iptceasy.vcxproj +++ b/contrib/vs2019/solution/samples/iptceasy.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/iptcprint.vcxproj b/contrib/vs2019/solution/samples/iptcprint.vcxproj index 2566c2ec..d98cfc65 100644 --- a/contrib/vs2019/solution/samples/iptcprint.vcxproj +++ b/contrib/vs2019/solution/samples/iptcprint.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/iptctest.vcxproj b/contrib/vs2019/solution/samples/iptctest.vcxproj index 180ff58d..a7b5d5e6 100644 --- a/contrib/vs2019/solution/samples/iptctest.vcxproj +++ b/contrib/vs2019/solution/samples/iptctest.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/key-test.vcxproj b/contrib/vs2019/solution/samples/key-test.vcxproj index 3c384b87..41a7e500 100644 --- a/contrib/vs2019/solution/samples/key-test.vcxproj +++ b/contrib/vs2019/solution/samples/key-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/largeiptc-test.vcxproj b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj index 0f6c2f19..2c42c4fe 100644 --- a/contrib/vs2019/solution/samples/largeiptc-test.vcxproj +++ b/contrib/vs2019/solution/samples/largeiptc-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/metacopy.vcxproj b/contrib/vs2019/solution/samples/metacopy.vcxproj index ffc7c42d..1b8e2b9b 100644 --- a/contrib/vs2019/solution/samples/metacopy.vcxproj +++ b/contrib/vs2019/solution/samples/metacopy.vcxproj @@ -240,13 +240,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/mmap-test.vcxproj b/contrib/vs2019/solution/samples/mmap-test.vcxproj index ff603e60..53c714e3 100644 --- a/contrib/vs2019/solution/samples/mmap-test.vcxproj +++ b/contrib/vs2019/solution/samples/mmap-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/mrwthumb.vcxproj b/contrib/vs2019/solution/samples/mrwthumb.vcxproj index da275b6e..df4b63f0 100644 --- a/contrib/vs2019/solution/samples/mrwthumb.vcxproj +++ b/contrib/vs2019/solution/samples/mrwthumb.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/pathtest.vcxproj b/contrib/vs2019/solution/samples/pathtest.vcxproj index c2cfe9be..d9511efb 100644 --- a/contrib/vs2019/solution/samples/pathtest.vcxproj +++ b/contrib/vs2019/solution/samples/pathtest.vcxproj @@ -240,13 +240,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/prevtest.vcxproj b/contrib/vs2019/solution/samples/prevtest.vcxproj index 1f186af0..36c88d15 100644 --- a/contrib/vs2019/solution/samples/prevtest.vcxproj +++ b/contrib/vs2019/solution/samples/prevtest.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/remotetest.vcxproj b/contrib/vs2019/solution/samples/remotetest.vcxproj index 0b1021dd..28ca4f34 100644 --- a/contrib/vs2019/solution/samples/remotetest.vcxproj +++ b/contrib/vs2019/solution/samples/remotetest.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/stringto-test.vcxproj b/contrib/vs2019/solution/samples/stringto-test.vcxproj index 9dc09320..d5b3a2a2 100644 --- a/contrib/vs2019/solution/samples/stringto-test.vcxproj +++ b/contrib/vs2019/solution/samples/stringto-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/taglist.vcxproj b/contrib/vs2019/solution/samples/taglist.vcxproj index 36515475..6834c780 100644 --- a/contrib/vs2019/solution/samples/taglist.vcxproj +++ b/contrib/vs2019/solution/samples/taglist.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/tiff-test.vcxproj b/contrib/vs2019/solution/samples/tiff-test.vcxproj index 0e88e326..97638591 100644 --- a/contrib/vs2019/solution/samples/tiff-test.vcxproj +++ b/contrib/vs2019/solution/samples/tiff-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/werror-test.vcxproj b/contrib/vs2019/solution/samples/werror-test.vcxproj index 98fda928..ff087e0f 100644 --- a/contrib/vs2019/solution/samples/werror-test.vcxproj +++ b/contrib/vs2019/solution/samples/werror-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/write-test.vcxproj b/contrib/vs2019/solution/samples/write-test.vcxproj index ee5ad282..14bd2b00 100644 --- a/contrib/vs2019/solution/samples/write-test.vcxproj +++ b/contrib/vs2019/solution/samples/write-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/write2-test.vcxproj b/contrib/vs2019/solution/samples/write2-test.vcxproj index 0434e966..97bb3bc7 100644 --- a/contrib/vs2019/solution/samples/write2-test.vcxproj +++ b/contrib/vs2019/solution/samples/write2-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/xmpdump.vcxproj b/contrib/vs2019/solution/samples/xmpdump.vcxproj index fe995df4..6ffeb7f2 100644 --- a/contrib/vs2019/solution/samples/xmpdump.vcxproj +++ b/contrib/vs2019/solution/samples/xmpdump.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/xmpparse.vcxproj b/contrib/vs2019/solution/samples/xmpparse.vcxproj index be3d095d..7343bee8 100644 --- a/contrib/vs2019/solution/samples/xmpparse.vcxproj +++ b/contrib/vs2019/solution/samples/xmpparse.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/xmpparser-test.vcxproj b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj index 54d56b1e..1c372ab6 100644 --- a/contrib/vs2019/solution/samples/xmpparser-test.vcxproj +++ b/contrib/vs2019/solution/samples/xmpparser-test.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/xmpprint.vcxproj b/contrib/vs2019/solution/samples/xmpprint.vcxproj index ece23d44..bc4217e6 100644 --- a/contrib/vs2019/solution/samples/xmpprint.vcxproj +++ b/contrib/vs2019/solution/samples/xmpprint.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/samples/xmpsample.vcxproj b/contrib/vs2019/solution/samples/xmpsample.vcxproj index 9c51b95f..d1084dec 100644 --- a/contrib/vs2019/solution/samples/xmpsample.vcxproj +++ b/contrib/vs2019/solution/samples/xmpsample.vcxproj @@ -238,13 +238,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/src/exiv2.vcxproj b/contrib/vs2019/solution/src/exiv2.vcxproj index 552af7cd..74fd14f8 100644 --- a/contrib/vs2019/solution/src/exiv2.vcxproj +++ b/contrib/vs2019/solution/src/exiv2.vcxproj @@ -241,13 +241,22 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} {b8b3b620-fc06-47d0-9d92-bd5cba448d84} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} diff --git a/contrib/vs2019/solution/unitTests/unit_tests.vcxproj b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj index 449c2f7e..892e8112 100644 --- a/contrib/vs2019/solution/unitTests/unit_tests.vcxproj +++ b/contrib/vs2019/solution/unitTests/unit_tests.vcxproj @@ -396,6 +396,15 @@ + + {39abfc9d-42b2-3e32-866b-ec2b980bf85c} + + + {e279dd40-3cac-3030-875b-28b50015788d} + + + {2fffa03d-a47c-3aeb-a9e9-611fe2dbba41} + {da6f56b4-06a4-441d-ad70-ac5a7d51fadb} @@ -408,7 +417,7 @@ {db773438-551f-38fa-8d50-d0261199236b} - + {58a821bc-e4af-4df4-9a54-2baa22b92615} From 216ae06c18e3c33f743d3ec3a33b1bb154daa883 Mon Sep 17 00:00:00 2001 From: clanmills Date: Tue, 7 Apr 2020 21:41:59 +0100 Subject: [PATCH 05/13] Discussed: https://github.com/Exiv2/exiv2/issues/1004#issuecomment-610609652 --- src/canonmn_int.cpp | 173 ++++++++++++++++++++------------------- test/data/exiv2-test.out | 10 +-- 2 files changed, 96 insertions(+), 87 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 19f0f6a0..57d99d79 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -312,6 +312,7 @@ namespace Exiv2 { { (long int)0x805, "PowerShot SX70 HS" }, { (long int)0x808, "PowerShot G7 X Mark III" }, { (long int)0x811, "EOS M6 Mark II" }, + { (long int)0x812, "EOS M200" }, { (long int)0x4007d673, "DC19/DC21/DC22" }, { (long int)0x4007d674, "XH A1" }, { (long int)0x4007d675, "HV10" }, @@ -402,11 +403,14 @@ namespace Exiv2 { { (long int)0x80000408, "EOS 77D / 9000D" }, { (long int)0x80000417, "EOS Rebel SL2 / 200D / Kiss X9" }, { (long int)0x80000422, "EOS Rebel T100 / 4000D / 3000D" }, - { (long int)0x80000424, "EOR R" }, + { (long int)0x80000424, "EOS R" }, + { (long int)0x80000428, "EOS-1D X Mark III" }, { (long int)0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90" }, { (long int)0x80000433, "EOS RP" }, { (long int)0x80000436, "EOS SL3 / 250D / Kiss X10" }, - { (long int)0x80000437, "EOS 90D" } + { (long int)0x80000437, "EOS 90D" }, + { (long int)0x80000520, "EOS D2000C" }, + { (long int)0x80000560, "EOS D6000C" } }; //! SerialNumberFormat, tag 0x0015 @@ -765,25 +769,25 @@ namespace Exiv2 { extern const TagDetails canonCsLensType[] = { { -1, "n/a" }, { 1, "Canon EF 50mm f/1.8" }, - { 2, "Canon EF 28mm f/2.8 or Sigma Lens" }, + { 2, "Canon EF 28mm f/2.8" }, { 2, "Sigma 24mm f/2.8 Super Wide II" }, // 1 { 3, "Canon EF 135mm f/2.8 Soft" }, - { 4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens" }, + { 4, "Canon EF 35-105mm f/3.5-4.5" }, { 4, "Sigma UC Zoom 35-135mm f/4-5.6" }, // 1 { 5, "Canon EF 35-70mm f/3.5-4.5" }, - { 6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens" }, + { 6, "Canon EF 28-70mm f/3.5-4.5" }, { 6, "Sigma 18-50mm f/3.5-5.6 DC" }, // 1 { 6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP" }, // 2 { 6, "Tokina AF 193-2 19-35mm f/3.5-4.5" }, // 3 { 6, "Sigma 28-80mm f/3.5-5.6 II Macro" }, // 4 { 6, "Sigma 28-300mm f/3.5-6.3 DG Macro" }, // 5 { 7, "Canon EF 100-300mm f/5.6L" }, - { 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens" }, + { 8, "Canon EF 100-300mm f/5.6" }, { 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro" }, // 1 { 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6" }, // 2 { 9, "Canon EF 70-210mm f/4" }, { 9, "Sigma 55-200mm f/4-5.6 DC" }, // 1 - { 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens" }, + { 10, "Canon EF 50mm f/2.5 Macro" }, { 10, "Sigma 50mm f/2.8 EX" }, // 1 { 10, "Sigma 28mm f/1.8" }, // 2 { 10, "Sigma 105mm f/2.8 Macro EX" }, // 3 @@ -797,12 +801,12 @@ namespace Exiv2 { { 18, "Canon EF 28-70mm f/3.5-4.5" }, { 20, "Canon EF 100-200mm f/4.5A" }, { 21, "Canon EF 80-200mm f/2.8L" }, - { 22, "Canon EF 20-35mm f/2.8L or Tokina Lens" }, + { 22, "Canon EF 20-35mm f/2.8L" }, { 22, "Tokina AT-X 280 AF Pro 28-80mm f/2.8 Aspherical" }, // 1 { 23, "Canon EF 35-105mm f/3.5-4.5" }, { 24, "Canon EF 35-80mm f/4-5.6 Power Zoom" }, { 25, "Canon EF 35-80mm f/4-5.6 Power Zoom" }, - { 26, "Canon EF 100mm f/2.8 Macro or Other Lens" }, + { 26, "Canon EF 100mm f/2.8 Macro" }, { 26, "Cosina 100mm f/3.5 Macro AF" }, // 1 { 26, "Tamron SP AF 90mm f/2.8 Di Macro" }, // 2 { 26, "Tamron SP AF 180mm f/3.5 Di Macro" }, // 3 @@ -810,16 +814,16 @@ namespace Exiv2 { { 26, "Voigtlander APO Lanthar 125mm F2.5 SL Macro" }, // 5 { 26, "Carl Zeiss Planar T 85mm f/1.4 ZE" }, // 6 { 27, "Canon EF 35-80mm f/4-5.6" }, - { 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens" }, + { 28, "Canon EF 80-200mm f/4.5-5.6" }, { 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 1 { 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 2 { 28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro" }, // 3 { 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6" }, // 4 { 29, "Canon EF 50mm f/1.8 II" }, { 30, "Canon EF 35-105mm f/4.5-5.6" }, - { 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens" }, + { 31, "Canon EF 75-300mm f/4-5.6" }, { 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1 - { 32, "Canon EF 24mm f/2.8 or Sigma Lens" }, + { 32, "Canon EF 24mm f/2.8" }, { 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1 { 33, "Voigtlander or Carl Zeiss Lens" }, { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1 @@ -838,22 +842,22 @@ namespace Exiv2 { { 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14 { 35, "Canon EF 35-80mm f/4-5.6" }, { 36, "Canon EF 38-76mm f/4.5-5.6" }, - { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens" }, + { 37, "Canon EF 35-80mm f/4-5.6" }, { 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1 - { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 2 + { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 2 { 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]" }, // 3 { 37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"}, // 4 { 38, "Canon EF 80-200mm f/4.5-5.6" }, { 39, "Canon EF 75-300mm f/4-5.6" }, { 40, "Canon EF 28-80mm f/3.5-5.6" }, { 41, "Canon EF 28-90mm f/4-5.6" }, - { 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens" }, - { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 1 + { 42, "Canon EF 28-200mm f/3.5-5.6" }, + { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 1 { 43, "Canon EF 28-105mm f/4-5.6" }, { 44, "Canon EF 90-300mm f/4.5-5.6" }, { 45, "Canon EF-S 18-55mm f/3.5-5.6 [II]" }, { 46, "Canon EF 28-90mm f/4-5.6" }, - { 47, "Zeiss Milvus 35mm f/2 or 50mm f/2" }, + { 47, "Zeiss Milvus 35mm f/2" }, { 47, "Zeiss Milvus 50mm f/2 Makro" }, // 1 { 47, "Zeiss Milvus 135mm f/2 ZE" }, // 2 { 48, "Canon EF-S 18-55mm f/3.5-5.6 IS" }, @@ -869,21 +873,23 @@ namespace Exiv2 { { 82, "Canon TS-E 135mm f/4L Macro" }, { 94, "Canon TS-E 17mm f/4L" }, { 95, "Canon TS-E 24mm f/3.5L II" }, - { 103, "Samyang AF 14mm f/2.8 EF or Rokinon Lens" }, + { 103, "Samyang AF 14mm f/2.8 EF" }, { 103, "Rokinon SP 14mm f/2.4" }, // 1 { 103, "Rokinon AF 14mm f/2.8 EF" }, // 2 { 106, "Rokinon SP / Samyang XP 35mm f/1.2" }, - { 112, "Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens" }, + { 112, "Sigma 28mm f/1.5 FF High-speed Prime" }, { 112, "Sigma 40mm f/1.5 FF High-speed Prime" }, // 1 { 112, "Sigma 105mm f/1.5 FF High-speed Prime" }, // 2 { 117, "Tamron 35-150mm f/2.8-4.0 Di VC OSD" }, + { 117, "Tamron SP 35mm f/1.4 Di USD" }, // 1 { 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" }, { 125, "Canon TS-E 24mm f/3.5L" }, { 126, "Canon TS-E 45mm f/2.8" }, { 127, "Canon TS-E 90mm f/2.8" }, + { 127, "Tamron 18-200mm f/3.5-6.3 Di II VC" }, // 1 { 129, "Canon EF 300mm f/2.8L USM" }, { 130, "Canon EF 50mm f/1.0L USM" }, - { 131, "Canon EF 28-80mm f/2.8-4L USM or Sigma Lens" }, + { 131, "Canon EF 28-80mm f/2.8-4L USM" }, { 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye" }, // 1 { 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM" }, // 2 { 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3 @@ -896,8 +902,8 @@ namespace Exiv2 { { 134, "Canon EF 600mm f/4L IS USM" }, { 135, "Canon EF 200mm f/1.8L USM" }, { 136, "Canon EF 300mm f/2.8L USM" }, - { 136, "Tamron SP 15-30mm f/2.8 Di VC USD A012" }, // 1 - { 137, "Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens" }, + { 136, "Tamron SP 15-30mm f/2.8 Di VC USD" }, // 1 + { 137, "Canon EF 85mm f/1.2L USM" }, { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1 { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2 { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM" }, // 3 @@ -920,49 +926,48 @@ namespace Exiv2 { { 140, "Canon EF 500mm f/4.5L USM" }, { 141, "Canon EF 500mm f/4.5L USM" }, { 142, "Canon EF 300mm f/2.8L IS USM" }, - { 143, "Canon EF 500mm f/4L IS USM or Sigma Lens" }, + { 143, "Canon EF 500mm f/4L IS USM" }, { 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1 - { 143, "Sigma 24-105mm F4 DG OS HSM [Art 013]" }, // 2 { 144, "Canon EF 35-135mm f/4-5.6 USM" }, { 145, "Canon EF 100-300mm f/4.5-5.6 USM" }, { 146, "Canon EF 70-210mm f/3.5-4.5 USM" }, { 147, "Canon EF 35-135mm f/4-5.6 USM" }, { 148, "Canon EF 28-80mm f/3.5-5.6 USM" }, { 149, "Canon EF 100mm f/2 USM" }, - { 150, "Canon EF 14mm f/2.8L USM or Sigma Lens" }, + { 150, "Canon EF 14mm f/2.8L USM" }, { 150, "Sigma 20mm EX f/1.8" }, // 1 { 150, "Sigma 30mm f/1.4 DC HSM" }, // 2 { 150, "Sigma 24mm f/1.8 DG Macro EX" }, // 3 { 150, "Sigma 28mm f/1.8 DG Macro EX" }, // 4 { 150, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 5 { 151, "Canon EF 200mm f/2.8L USM" }, - { 152, "Canon EF 300mm f/4L IS USM or Sigma Lens" }, + { 152, "Canon EF 300mm f/4L IS USM" }, { 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM" }, // 1 { 152, "Sigma 14mm f/2.8 EX Aspherical HSM" }, // 2 { 152, "Sigma 10-20mm f/4-5.6" }, // 3 { 152, "Sigma 100-300mm f/4" }, // 4 { 152, "Sigma 300-800mm f/5.6 APO EX DG HSM" }, // 5 - { 153, "Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens" }, + { 153, "Canon EF 35-350mm f/3.5-5.6L USM" }, { 153, "Sigma 50-500mm f/4-6.3 APO HSM EX" }, // 1 { 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro" }, // 2 - { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"}, // 3 + { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"}, // 3 { 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro" }, // 4 - { 154, "Canon EF 20mm f/2.8 USM or Zeiss Lens" }, + { 154, "Canon EF 20mm f/2.8 USM" }, { 154, "Zeiss Milvus 21mm f/2.8" }, // 1 { 154, "Zeiss Milvus 15mm f/2.8 ZE" }, // 2 { 154, "Zeiss Milvus 18mm f/2.8 ZE" }, // 3 - { 155, "Canon EF 85mm f/1.8 USM or Sigma Lens" }, + { 155, "Canon EF 85mm f/1.8 USM" }, { 155, "Sigma 14mm f/1.8 DG HSM | A" }, // 1 - { 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens" }, + { 156, "Canon EF 28-105mm f/3.5-4.5 USM" }, { 156, "Tamron SP 70-300mm f/4-5.6 Di VC USD" }, // 1 { 156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 2 - { 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens" }, + { 160, "Canon EF 20-35mm f/3.5-4.5 USM" }, { 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1 { 160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4" }, // 2 { 160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye" }, // 3 { 160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8" }, // 4 { 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8" }, // 5 - { 161, "Canon EF 28-70mm f/2.8L USM or Other Lens" }, + { 161, "Canon EF 28-70mm f/2.8L USM" }, { 161, "Sigma 24-70mm f/2.8 EX" }, // 1 { 161, "Sigma 28-70mm f/2.8 EX" }, // 2 { 161, "Sigma 24-60mm f/2.8 EX DG" }, // 3 @@ -977,9 +982,9 @@ namespace Exiv2 { { 165, "Canon EF 70-200mm f/2.8L USM" }, { 166, "Canon EF 70-200mm f/2.8L USM + 1.4x" }, { 167, "Canon EF 70-200mm f/2.8L USM + 2x" }, - { 168, "Canon EF 28mm f/1.8 USM or Sigma Lens" }, + { 168, "Canon EF 28mm f/1.8 USM" }, { 168, "Sigma 50-100mm f/1.8 DC HSM | A" }, // 1 - { 169, "Canon EF 17-35mm f/2.8L USM or Sigma Lens" }, + { 169, "Canon EF 17-35mm f/2.8L USM" }, { 169, "Sigma 18-200mm f/3.5-6.3 DC OS" }, // 1 { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical" }, // 2 { 169, "Sigma 18-50mm f/2.8 Macro" }, // 3 @@ -989,20 +994,20 @@ namespace Exiv2 { { 169, "Sigma 35mm f/1.4 DG HSM" }, // 7 { 169, "Sigma 35mm f/1.5 FF High-Speed Prime | 017" }, // 8 { 169, "Sigma 70mm f/2.8 Macro EX DG" }, // 9 - { 170, "Canon EF 200mm f/2.8L II USM or Sigma Lens" }, + { 170, "Canon EF 200mm f/2.8L II USM" }, { 170, "Sigma 300mm f/2.8 APO EX DG HSM" }, // 1 { 170, "Sigma 800mm f/5.6 APO EX DG HSM" }, // 2 { 171, "Canon EF 300mm f/4L USM" }, - { 172, "Canon EF 400mm f/5.6L USM or Sigma Lens" }, + { 172, "Canon EF 400mm f/5.6L USM" }, { 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1 { 172, "Sigma 500mm f/4.5 APO EX DG HSM" }, // 2 - { 173, "Canon EF 180mm Macro f/3.5L USM or Sigma Lens" }, + { 173, "Canon EF 180mm Macro f/3.5L USM" }, { 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1 - { 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 2 - { 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 3 - { 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 4 - { 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 5 - { 174, "Canon EF 135mm f/2L USM or Other Lens" }, + { 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 2 + { 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3 + { 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4 + { 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5 + { 174, "Canon EF 135mm f/2L USM" }, { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1 { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2 { 174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM" }, // 3 @@ -1017,7 +1022,7 @@ namespace Exiv2 { { 177, "Canon EF 300mm f/4L IS USM" }, { 178, "Canon EF 28-135mm f/3.5-5.6 IS" }, { 179, "Canon EF 24mm f/1.4L USM" }, - { 180, "Canon EF 35mm f/1.4L USM or Other Lens" }, + { 180, "Canon EF 35mm f/1.4L USM" }, { 180, "Sigma 50mm f/1.4 DG HSM | A" }, // 1 { 180, "Sigma 24mm f/1.4 DG HSM | A" }, // 2 { 180, "Zeiss Milvus 50mm f/1.4" }, // 3 @@ -1028,11 +1033,11 @@ namespace Exiv2 { { 180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017" }, // 8 { 180, "Tokina Opera 50mm f/1.4 FF" }, // 9 { 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 10 - { 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens" }, + { 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x" }, { 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x" }, // 1 - { 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens" }, + { 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x" }, { 182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x" }, // 1 - { 183, "Canon EF 100-400mm f/4.5-5.6L IS USM or Sigma Lens" }, + { 183, "Canon EF 100-400mm f/4.5-5.6L IS USM" }, { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro" }, // 1 { 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro" }, // 2 { 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 3 @@ -1047,15 +1052,15 @@ namespace Exiv2 { { 188, "Canon EF 70-200mm f/4L USM + 2x" }, { 189, "Canon EF 70-200mm f/4L USM + 2.8x" }, { 190, "Canon EF 100mm f/2.8 Macro USM" }, - { 191, "Canon EF 400mm f/4 DO IS or Sigma Lens" }, + { 191, "Canon EF 400mm f/4 DO IS" }, { 191, "Sigma 500mm f/4 DG OS HSM" }, // 1 { 193, "Canon EF 35-80mm f/4-5.6 USM" }, { 194, "Canon EF 80-200mm f/4.5-5.6 USM" }, { 195, "Canon EF 35-105mm f/4.5-5.6 USM" }, { 196, "Canon EF 75-300mm f/4-5.6 USM" }, - { 197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens" }, - { 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS" }, // 1 - { 198, "Canon EF 50mm f/1.4 USM or Other Lens" }, + { 197, "Canon EF 75-300mm f/4-5.6 IS USM" }, + { 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HSM" }, // 1 + { 198, "Canon EF 50mm f/1.4 USM" }, { 198, "Zeiss Otus 55mm f/1.4 ZE" }, // 1 { 198, "Zeiss Otus 85mm f/1.4 ZE" }, // 2 { 198, "Zeiss Milvus 25mm f/1.4" }, // 3 @@ -1071,7 +1076,7 @@ namespace Exiv2 { { 210, "Canon EF 28-90mm f/4-5.6 USM" }, { 211, "Canon EF 28-200mm f/3.5-5.6 USM" }, { 212, "Canon EF 28-105mm f/4-5.6 USM" }, - { 213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens" }, + { 213, "Canon EF 90-300mm f/4.5-5.6 USM" }, { 213, "Tamron SP 150-600mm f/5-6.3 Di VC USD" }, // 1 { 213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro" }, // 2 { 213, "Tamron SP 35mm f/1.8 Di VC USD" }, // 3 @@ -1087,19 +1092,19 @@ namespace Exiv2 { { 228, "Canon EF 28-105mm f/3.5-4.5 USM" }, { 229, "Canon EF 16-35mm f/2.8L USM" }, { 230, "Canon EF 24-70mm f/2.8L USM" }, - { 231, "Canon EF 17-40mm f/4L USM or Sigma Lens" }, + { 231, "Canon EF 17-40mm f/4L USM" }, { 231, "Sigma 12-24mm f/4 DG HSM A016" }, // 1 { 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM" }, { 233, "Canon EF 28-300mm f/3.5-5.6L IS USM" }, - { 234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens" }, + { 234, "Canon EF-S 17-85mm f/4-5.6 IS USM" }, { 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4" }, // 1 { 235, "Canon EF-S 10-22mm f/3.5-4.5 USM" }, { 236, "Canon EF-S 60mm f/2.8 Macro USM" }, { 237, "Canon EF 24-105mm f/4L IS USM" }, { 238, "Canon EF 70-300mm f/4-5.6 IS USM" }, - { 239, "Canon EF 85mm f/1.2L II USM or Rokinon Lens" }, + { 239, "Canon EF 85mm f/1.2L II USM" }, { 239, "Rokinon SP 85mm f/1.2" }, // 1 - { 240, "Canon EF-S 17-55mm f/2.8 IS USM or Sigma Lens" }, + { 240, "Canon EF-S 17-55mm f/2.8 IS USM" }, { 240, "Sigma 17-50mm f/2.8 EX DC OS HSM" }, // 1 { 241, "Canon EF 50mm f/1.2L USM" }, { 242, "Canon EF 70-200mm f/4L IS USM" }, @@ -1108,13 +1113,13 @@ namespace Exiv2 { { 245, "Canon EF 70-200mm f/4L IS USM + 2.8x" }, { 246, "Canon EF 16-35mm f/2.8L II USM" }, { 247, "Canon EF 14mm f/2.8L II USM" }, - { 248, "Canon EF 200mm f/2L IS USM or Sigma Lens" }, + { 248, "Canon EF 200mm f/2L IS USM" }, { 248, "Sigma 24-35mm f/2 DG HSM | A" }, // 1 { 248, "Sigma 135mm f/2 FF High-Speed Prime | 017" }, // 2 { 248, "Sigma 24-35mm f/2.2 FF Zoom | 017" }, // 3 { 248, "Sigma 135mm f/1.8 DG HSM A017" }, // 4 { 249, "Canon EF 800mm f/5.6L IS USM" }, - { 250, "Canon EF 24mm f/1.4L II USM or Sigma Lens" }, + { 250, "Canon EF 24mm f/1.4L II USM" }, { 250, "Sigma 20mm f/1.4 DG HSM | A" }, // 1 { 250, "Sigma 20mm f/1.5 FF High-Speed Prime | 017" }, // 2 { 250, "Tokina Opera 16-28mm f/2.8 FF" }, // 3 @@ -1126,10 +1131,9 @@ namespace Exiv2 { { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" }, { 253, "Canon EF 70-200mm f/2.8L IS III USM + 2x" }, // 1 { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, - { 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 1 - { 255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens" }, + { 255, "Sigma 24-105mm f/4 DG OS HSM | A" }, { 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1 - { 368, "Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens" }, + { 368, "Sigma 14-24mm f/2.8 DG HSM | A" }, { 368, "Sigma 20mm f/1.4 DG HSM | A" }, // 1 { 368, "Sigma 50mm f/1.4 DG HSM | A" }, // 2 { 368, "Sigma 40mm f/1.4 DG HSM | A" }, // 3 @@ -1143,38 +1147,40 @@ namespace Exiv2 { { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" }, { 489, "Canon EF 70-300mm f/4-5.6L IS USM" }, { 490, "Canon EF 8-15mm f/4L Fisheye USM" }, - { 491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens" }, - { 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)" }, // 1 - { 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)" }, // 2 - { 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD (A035)" }, // 3 - { 491, "Tamron 70-210mm f/4 Di VC USD (A034)" }, // 4 - { 491, "Tamron 70-210mm f/4 Di VC USD (A034) + 1.4x" }, // 5 - { 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)" }, // 6 + { 491, "Canon EF 300mm f/2.8L IS II USM" }, + { 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2" }, // 1 + { 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD" }, // 2 + { 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD" }, // 3 + { 491, "Tamron 70-210mm f/4 Di VC USD" }, // 4 + { 491, "Tamron 70-210mm f/4 Di VC USD + 1.4x" }, // 5 + { 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2" }, // 6 { 492, "Canon EF 400mm f/2.8L IS II USM" }, - { 493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM" }, + { 493, "Canon EF 500mm f/4L IS II USM" }, { 493, "Canon EF 24-105mm f/4L IS USM" }, // 1 { 494, "Canon EF 600mm f/4L IS II USM" }, - { 495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens" }, - { 495, "Sigma 24-70mm F2.8 DG OS HSM | A" }, // 1 + { 495, "Canon EF 24-70mm f/2.8L II USM" }, + { 495, "Sigma 24-70mm f/2.8 DG OS HSM | A" }, // 1 { 496, "Canon EF 200-400mm f/4L IS USM" }, { 499, "Canon EF 200-400mm f/4L IS USM + 1.4x" }, - { 502, "Canon EF 28mm f/2.8 IS USM or Tamron Lens" }, - { 502, "Tamron 35mm f/1.8 Di VC USD (F012)" }, // 1 + { 502, "Canon EF 28mm f/2.8 IS USM" }, + { 502, "Tamron 35mm f/1.8 Di VC USD" }, // 1 { 503, "Canon EF 24mm f/2.8 IS USM" }, { 504, "Canon EF 24-70mm f/4L IS USM" }, { 505, "Canon EF 35mm f/2 IS USM" }, { 506, "Canon EF 400mm f/4 DO IS II USM" }, { 507, "Canon EF 16-35mm f/4L IS USM" }, - { 508, "Canon EF 11-24mm f/4L USM or Tamron Lens" }, + { 508, "Canon EF 11-24mm f/4L USM" }, { 508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD" }, // 1 - { 624, "Sigma 70-200mm F2.8 DG OS HSM | S" }, - { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens" }, + { 624, "Sigma 70-200mm f/2.8 DG OS HSM | S" }, + { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM" }, { 747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2" }, // 1 - { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"}, - { 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x" }, // 1 - { 748, "Tamron 70-210mm f/4 Di VC USD (A034) + 2x" }, // 2 - { 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x" }, + { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x" }, + { 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 1.4x" }, // 1 + { 748, "Tamron 70-210mm f/4 Di VC USD + 2x" }, // 2 + { 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 2x" }, { 750, "Canon EF 35mm f/1.4L II USM" }, + { 750, "Tamron SP 85mm f/1.8 Di VC USD" }, // 1 + { 750, "Tamron SP 45mm f/1.8 Di VC USD" }, // 2 { 751, "Canon EF 16-35mm f/2.8L III USM" }, { 752, "Canon EF 24-105mm f/4L IS II USM" }, { 753, "Canon EF 85mm f/1.4L IS USM" }, @@ -1183,7 +1189,7 @@ namespace Exiv2 { { 758, "Canon EF 600mm f/4L IS III USM" }, { 1136, "Sigma 24-70mm f/2.8 DG OS HSM | Art 017" }, { 4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM" }, - { 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens" }, + { 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM" }, { 4143, "Tamron 18-200mm f/3.5-6.3 Di III VC" }, // 1 { 4144, "Canon EF 40mm f/2.8 STM" }, { 4145, "Canon EF-M 22mm f/2 STM" }, @@ -1201,6 +1207,7 @@ namespace Exiv2 { { 4158, "Canon EF-S 18-55mm f/4-5.6 IS STM" }, { 4159, "Canon EF-M 32mm f/1.4 STM" }, { 4160, "Canon EF-S 35mm f/2.8 Macro IS STM" }, + { 4208, "Sigma 56mm f/1.4 DC DN | C" }, {36910, "Canon EF 70-300mm f/4-5.6 IS II USM" }, {36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM" }, {61491, "Canon CN-E 14mm T3.1 L F" }, @@ -1208,12 +1215,14 @@ namespace Exiv2 { {61494, "Canon CN-E 85mm T1.3 L F" }, {61495, "Canon CN-E 135mm T2.2 L F" }, {61496, "Canon CN-E 35mm T1.5 L F" }, - {61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens" }, + {61182, "Canon RF 35mm F1.8 Macro IS STM" }, {61182, "Canon RF 50mm F1.2 L USM" }, // 1 {61182, "Canon RF 24-105mm F4 L IS USM" }, // 2 {61182, "Canon RF 28-70mm F2 L USM" }, // 3 {61182, "Canon RF 85mm F1.2L USM" }, // 4 {61182, "Canon RF 24-240mm F4-6.3 IS USM" }, // 5 + {61182, "Canon RF 24-70mm F2.8 L IS USM" }, // 6 + {61182, "Canon RF 15-35mm F2.8 L IS USM" }, // 7 {65535, "n/a" } }; diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index 2fbc7281..ab2e49bd 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -1890,7 +1890,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens +20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -3502,7 +3502,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected < 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) < 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens +< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM < 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm < 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 < 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -5043,7 +5043,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected > 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) > 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0 -> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens +> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM > 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm > 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8 > 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22 @@ -6804,7 +6804,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected < 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) < 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens +< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM < 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm < 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 < 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -8345,7 +8345,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected > 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) > 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0 -> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens +> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM > 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm > 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8 > 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22 From 149688076d16b94997b3beabfe2e19de6c356028 Mon Sep 17 00:00:00 2001 From: clanmills Date: Wed, 8 Apr 2020 18:34:48 +0100 Subject: [PATCH 06/13] Discussion: https://github.com/Exiv2/exiv2/issues/1004#issuecomment-611064916 --- src/canonmn_int.cpp | 5 ++++- test/functions.source | 8 ++++++-- test/path-test.sh | 6 +++--- test/xmpparser-test.sh | 1 + tests/bugfixes/github/test_issue_20.py | 4 ++-- tests/bugfixes/github/test_issue_45.py | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index 57d99d79..b3443819 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -928,6 +928,7 @@ namespace Exiv2 { { 142, "Canon EF 300mm f/2.8L IS USM" }, { 143, "Canon EF 500mm f/4L IS USM" }, { 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1 + { 143, "Sigma 24-105mm F4 DG OS HSM | A" }, // 2 { 144, "Canon EF 35-135mm f/4-5.6 USM" }, { 145, "Canon EF 100-300mm f/4.5-5.6 USM" }, { 146, "Canon EF 70-210mm f/3.5-4.5 USM" }, @@ -1007,6 +1008,7 @@ namespace Exiv2 { { 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3 { 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4 { 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5 + { 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 6 { 174, "Canon EF 135mm f/2L USM" }, { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1 { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2 @@ -1130,7 +1132,8 @@ namespace Exiv2 { { 252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x" }, // 1 { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" }, { 253, "Canon EF 70-200mm f/2.8L IS III USM + 2x" }, // 1 - { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, + { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 1 + { 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 2 { 255, "Sigma 24-105mm f/4 DG OS HSM | A" }, { 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1 { 368, "Sigma 14-24mm f/2.8 DG HSM | A" }, diff --git a/test/functions.source b/test/functions.source index 40eb08dd..9ea3d4af 100644 --- a/test/functions.source +++ b/test/functions.source @@ -11,7 +11,7 @@ runTest() if [ ! -z $EXIV2_ECHO ]; then echoTest $VALGRIND $bin$prog "$@" fi - $VALGRIND $bin$prog "$@" + $VALGRIND $bin$prog$exe "$@" ) } @@ -37,7 +37,7 @@ existsTest() result=1 fi else - if [ -e $bin$prog -o -e $bin$prog.exe ]; then + if [ -e $bin$prog -o -e $bin$prog$exe ]; then result=1 fi fi @@ -464,6 +464,10 @@ prepareTest() if [ "$PLATFORM" == cygwin -o "$PLATFORM" == mingw ]; then exe=.exe fi + + if [ !-z $EXIV2_EXT ]; then + exe=$EXIV2_EXT + fi if [ "$PLATFORM" == cygwin ]; then # We need a private version of diff for linux compatibility diff --git a/test/path-test.sh b/test/path-test.sh index c7e03a82..8d9ac192 100755 --- a/test/path-test.sh +++ b/test/path-test.sh @@ -4,13 +4,13 @@ source ./functions.source ( cd "$testdir" - if [ $(existsTest path-test) == 1 ] ; then + if [ $(existsTest pathtest) == 1 ] ; then copyTestFile path-test.txt - runTest path-test path-test.txt + runTest pathtest path-test.txt else echo "$0: path-test executable not found. Skipping path tests." fi ) # That's all Folks! -## \ No newline at end of file +## diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh index db9c7933..94981d72 100755 --- a/test/xmpparser-test.sh +++ b/test/xmpparser-test.sh @@ -17,6 +17,7 @@ fi for f in ${files[@]} ; do runTest xmpparser-test $f + # unix2dos -q ${f}-new diff $f ${f}-new done diff --git a/tests/bugfixes/github/test_issue_20.py b/tests/bugfixes/github/test_issue_20.py index 1733dc02..2bf20782 100644 --- a/tests/bugfixes/github/test_issue_20.py +++ b/tests/bugfixes/github/test_issue_20.py @@ -5,7 +5,7 @@ import system_tests class TamronSupport(metaclass=system_tests.CaseMeta): - description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'" + description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'" files = [ "exiv2-g20.exv", @@ -36,7 +36,7 @@ Exif.Photo.LensSerialNumber Ascii 12 0000000000 """, # TamronSP15-30mmF2.8DiVCUSDA012.exv" - """Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD A012 + """Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD """, # TamronSP90mmF2.8DiVCUSDMacroF004.exv diff --git a/tests/bugfixes/github/test_issue_45.py b/tests/bugfixes/github/test_issue_45.py index 16727b26..ca7ca1d4 100644 --- a/tests/bugfixes/github/test_issue_45.py +++ b/tests/bugfixes/github/test_issue_45.py @@ -9,7 +9,7 @@ class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-g45.exv" commands = ["$exiv2 -pa --grep lens/i " + filename] - stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM [Art 013] + stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM | A Exif.CanonCs.Lens Short 3 24.0 - 105.0 mm Exif.CanonCf.LensAFStopButton Short 1 0 Exif.Canon.LensModel Ascii 74 24-105mm F4 DG OS HSM | Art 013 From cb561d3d1262e9dc805b1968268dd75472b3cadd Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 12 Apr 2020 11:36:05 +0100 Subject: [PATCH 07/13] use $diffargs when executing diff. Remove unix2dos --- test/xmpparser-test.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh index 94981d72..2d56fd1b 100755 --- a/test/xmpparser-test.sh +++ b/test/xmpparser-test.sh @@ -17,14 +17,13 @@ fi for f in ${files[@]} ; do runTest xmpparser-test $f - # unix2dos -q ${f}-new - diff $f ${f}-new + diff $diffargs $f ${f}-new done testfile=xmpsdk.xmp runTest xmpparse ${testfile} > t1 2>&1 runTest xmpparse ${testfile}-new > t2 2>&1 - diff t1 t2 + diff $diffargs t1 t2 # ---------------------------------------------------------------------- # xmpsample From bd4c970d4f80204ce840bbf738fa877f0975676f Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 12 Apr 2020 11:41:12 +0100 Subject: [PATCH 08/13] Get functions.source to respect the environment string EXIV2_EXT --- test/functions.source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functions.source b/test/functions.source index 9ea3d4af..ad73eb43 100644 --- a/test/functions.source +++ b/test/functions.source @@ -465,7 +465,7 @@ prepareTest() exe=.exe fi - if [ !-z $EXIV2_EXT ]; then + if [ ! -z $EXIV2_EXT ]; then exe=$EXIV2_EXT fi From dc92e0fc057a0ca89e759a5ac05d2ce7c95b23c8 Mon Sep 17 00:00:00 2001 From: Sridhar Boovaraghavan Date: Mon, 13 Apr 2020 11:02:23 +0530 Subject: [PATCH 09/13] Updated dependencies --- contrib/vs2019/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/vs2019/README.md b/contrib/vs2019/README.md index 327629c4..8705be80 100644 --- a/contrib/vs2019/README.md +++ b/contrib/vs2019/README.md @@ -252,18 +252,18 @@ heirarchy and compile correctly. ``` # Dependencies # - * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git) + * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git)[^12] * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com)[^2] * [NASM, used 2.14.02 x64](https://www.nasm.us/)[^3] * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat)[^4] * [OpenSSL, tested w/ v1.1.1g-DEV](https://github.com/openssl/openssl)[^5] + * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)[^10] * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git)[^6] + * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli)[^11] * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git)[^7] * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8] * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git)[^9] * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64) - * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)[^10] - * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli)[^11] * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/) [^1]: It has since been killed by google. (You can find the last released version here: [Picasa 3.9.141, build 259](https://1drv.ms/u/s!AuE8ZYzPkfMfiEzdlKtVVjN-MReT)) @@ -272,17 +272,15 @@ heirarchy and compile correctly. openssl makefile to generate the initial configuration. Even this is not necessary if the configuration that I chose applies to you. -[^3]: Binary distribution. See [^3]. +[^3]: Binary distribution. See [^2]. -[^4]: Use my [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64) to -compile on Windows using Visual Studio +[^4]: Use my [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64) to compile on Windows using Visual Studio [^5]: Use my [openssl-x86_x64](https://github.com/sridharb1/openssl-x86_x64) to compile on Windows using Visual Studio [^6]: Use my [libssh2-x86_x64](https://github.com/sridharb1/libssh2-x86_x64.git) to compile on Windows using Visual Studio -[^7]: Use my [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git) to -compile on Windows using Visual Studio +[^7]: Use my [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git) to compile on Windows using Visual Studio [^8]: Use my [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git) to compile on Windows using Visual Studio @@ -291,3 +289,5 @@ compile on Windows using Visual Studio [^10]: Use my [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git) to compile on Windows using Visual Studio [^11]: Use my [brotli-x86_x64](https://github.com/sridharb1/brotli-x86_x64)to compile on Windows using Visual Studio + +[^12]: Use my [zlib-x86_x64](https://github.com/sridharb1/zlib-x86_x64)to compile on Windows using Visual Studio From 3bcc6c8156372f7243e67ef0e29697af4a587dd3 Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 13 Apr 2020 23:13:08 +0100 Subject: [PATCH 10/13] Restoring files which should in PR fix_1004_0.27 (they are unrelated to contrib/vs2019) --- src/canonmn_int.cpp | 178 ++++++++++++------------- test/data/exiv2-test.out | 10 +- test/functions.source | 8 +- test/path-test.sh | 6 +- test/xmpparser-test.sh | 4 +- tests/bugfixes/github/test_issue_20.py | 4 +- tests/bugfixes/github/test_issue_45.py | 2 +- 7 files changed, 98 insertions(+), 114 deletions(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index b3443819..19f0f6a0 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -312,7 +312,6 @@ namespace Exiv2 { { (long int)0x805, "PowerShot SX70 HS" }, { (long int)0x808, "PowerShot G7 X Mark III" }, { (long int)0x811, "EOS M6 Mark II" }, - { (long int)0x812, "EOS M200" }, { (long int)0x4007d673, "DC19/DC21/DC22" }, { (long int)0x4007d674, "XH A1" }, { (long int)0x4007d675, "HV10" }, @@ -403,14 +402,11 @@ namespace Exiv2 { { (long int)0x80000408, "EOS 77D / 9000D" }, { (long int)0x80000417, "EOS Rebel SL2 / 200D / Kiss X9" }, { (long int)0x80000422, "EOS Rebel T100 / 4000D / 3000D" }, - { (long int)0x80000424, "EOS R" }, - { (long int)0x80000428, "EOS-1D X Mark III" }, + { (long int)0x80000424, "EOR R" }, { (long int)0x80000432, "EOS Rebel T7 / 2000D / 1500D / Kiss X90" }, { (long int)0x80000433, "EOS RP" }, { (long int)0x80000436, "EOS SL3 / 250D / Kiss X10" }, - { (long int)0x80000437, "EOS 90D" }, - { (long int)0x80000520, "EOS D2000C" }, - { (long int)0x80000560, "EOS D6000C" } + { (long int)0x80000437, "EOS 90D" } }; //! SerialNumberFormat, tag 0x0015 @@ -769,25 +765,25 @@ namespace Exiv2 { extern const TagDetails canonCsLensType[] = { { -1, "n/a" }, { 1, "Canon EF 50mm f/1.8" }, - { 2, "Canon EF 28mm f/2.8" }, + { 2, "Canon EF 28mm f/2.8 or Sigma Lens" }, { 2, "Sigma 24mm f/2.8 Super Wide II" }, // 1 { 3, "Canon EF 135mm f/2.8 Soft" }, - { 4, "Canon EF 35-105mm f/3.5-4.5" }, + { 4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens" }, { 4, "Sigma UC Zoom 35-135mm f/4-5.6" }, // 1 { 5, "Canon EF 35-70mm f/3.5-4.5" }, - { 6, "Canon EF 28-70mm f/3.5-4.5" }, + { 6, "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens" }, { 6, "Sigma 18-50mm f/3.5-5.6 DC" }, // 1 { 6, "Sigma 18-125mm f/3.5-5.6 DC IF ASP" }, // 2 { 6, "Tokina AF 193-2 19-35mm f/3.5-4.5" }, // 3 { 6, "Sigma 28-80mm f/3.5-5.6 II Macro" }, // 4 { 6, "Sigma 28-300mm f/3.5-6.3 DG Macro" }, // 5 { 7, "Canon EF 100-300mm f/5.6L" }, - { 8, "Canon EF 100-300mm f/5.6" }, + { 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens" }, { 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro" }, // 1 { 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6" }, // 2 { 9, "Canon EF 70-210mm f/4" }, { 9, "Sigma 55-200mm f/4-5.6 DC" }, // 1 - { 10, "Canon EF 50mm f/2.5 Macro" }, + { 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens" }, { 10, "Sigma 50mm f/2.8 EX" }, // 1 { 10, "Sigma 28mm f/1.8" }, // 2 { 10, "Sigma 105mm f/2.8 Macro EX" }, // 3 @@ -801,12 +797,12 @@ namespace Exiv2 { { 18, "Canon EF 28-70mm f/3.5-4.5" }, { 20, "Canon EF 100-200mm f/4.5A" }, { 21, "Canon EF 80-200mm f/2.8L" }, - { 22, "Canon EF 20-35mm f/2.8L" }, + { 22, "Canon EF 20-35mm f/2.8L or Tokina Lens" }, { 22, "Tokina AT-X 280 AF Pro 28-80mm f/2.8 Aspherical" }, // 1 { 23, "Canon EF 35-105mm f/3.5-4.5" }, { 24, "Canon EF 35-80mm f/4-5.6 Power Zoom" }, { 25, "Canon EF 35-80mm f/4-5.6 Power Zoom" }, - { 26, "Canon EF 100mm f/2.8 Macro" }, + { 26, "Canon EF 100mm f/2.8 Macro or Other Lens" }, { 26, "Cosina 100mm f/3.5 Macro AF" }, // 1 { 26, "Tamron SP AF 90mm f/2.8 Di Macro" }, // 2 { 26, "Tamron SP AF 180mm f/3.5 Di Macro" }, // 3 @@ -814,16 +810,16 @@ namespace Exiv2 { { 26, "Voigtlander APO Lanthar 125mm F2.5 SL Macro" }, // 5 { 26, "Carl Zeiss Planar T 85mm f/1.4 ZE" }, // 6 { 27, "Canon EF 35-80mm f/4-5.6" }, - { 28, "Canon EF 80-200mm f/4.5-5.6" }, + { 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens" }, { 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 1 { 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 2 { 28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro" }, // 3 { 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6" }, // 4 { 29, "Canon EF 50mm f/1.8 II" }, { 30, "Canon EF 35-105mm f/4.5-5.6" }, - { 31, "Canon EF 75-300mm f/4-5.6" }, + { 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens" }, { 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1 - { 32, "Canon EF 24mm f/2.8" }, + { 32, "Canon EF 24mm f/2.8 or Sigma Lens" }, { 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1 { 33, "Voigtlander or Carl Zeiss Lens" }, { 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1 @@ -842,22 +838,22 @@ namespace Exiv2 { { 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14 { 35, "Canon EF 35-80mm f/4-5.6" }, { 36, "Canon EF 38-76mm f/4.5-5.6" }, - { 37, "Canon EF 35-80mm f/4-5.6" }, + { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens" }, { 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1 - { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 2 + { 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 2 { 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]" }, // 3 { 37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"}, // 4 { 38, "Canon EF 80-200mm f/4.5-5.6" }, { 39, "Canon EF 75-300mm f/4-5.6" }, { 40, "Canon EF 28-80mm f/3.5-5.6" }, { 41, "Canon EF 28-90mm f/4-5.6" }, - { 42, "Canon EF 28-200mm f/3.5-5.6" }, - { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro"}, // 1 + { 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens" }, + { 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"}, // 1 { 43, "Canon EF 28-105mm f/4-5.6" }, { 44, "Canon EF 90-300mm f/4.5-5.6" }, { 45, "Canon EF-S 18-55mm f/3.5-5.6 [II]" }, { 46, "Canon EF 28-90mm f/4-5.6" }, - { 47, "Zeiss Milvus 35mm f/2" }, + { 47, "Zeiss Milvus 35mm f/2 or 50mm f/2" }, { 47, "Zeiss Milvus 50mm f/2 Makro" }, // 1 { 47, "Zeiss Milvus 135mm f/2 ZE" }, // 2 { 48, "Canon EF-S 18-55mm f/3.5-5.6 IS" }, @@ -873,23 +869,21 @@ namespace Exiv2 { { 82, "Canon TS-E 135mm f/4L Macro" }, { 94, "Canon TS-E 17mm f/4L" }, { 95, "Canon TS-E 24mm f/3.5L II" }, - { 103, "Samyang AF 14mm f/2.8 EF" }, + { 103, "Samyang AF 14mm f/2.8 EF or Rokinon Lens" }, { 103, "Rokinon SP 14mm f/2.4" }, // 1 { 103, "Rokinon AF 14mm f/2.8 EF" }, // 2 { 106, "Rokinon SP / Samyang XP 35mm f/1.2" }, - { 112, "Sigma 28mm f/1.5 FF High-speed Prime" }, + { 112, "Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens" }, { 112, "Sigma 40mm f/1.5 FF High-speed Prime" }, // 1 { 112, "Sigma 105mm f/1.5 FF High-speed Prime" }, // 2 { 117, "Tamron 35-150mm f/2.8-4.0 Di VC OSD" }, - { 117, "Tamron SP 35mm f/1.4 Di USD" }, // 1 { 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" }, { 125, "Canon TS-E 24mm f/3.5L" }, { 126, "Canon TS-E 45mm f/2.8" }, { 127, "Canon TS-E 90mm f/2.8" }, - { 127, "Tamron 18-200mm f/3.5-6.3 Di II VC" }, // 1 { 129, "Canon EF 300mm f/2.8L USM" }, { 130, "Canon EF 50mm f/1.0L USM" }, - { 131, "Canon EF 28-80mm f/2.8-4L USM" }, + { 131, "Canon EF 28-80mm f/2.8-4L USM or Sigma Lens" }, { 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye" }, // 1 { 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM" }, // 2 { 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3 @@ -902,8 +896,8 @@ namespace Exiv2 { { 134, "Canon EF 600mm f/4L IS USM" }, { 135, "Canon EF 200mm f/1.8L USM" }, { 136, "Canon EF 300mm f/2.8L USM" }, - { 136, "Tamron SP 15-30mm f/2.8 Di VC USD" }, // 1 - { 137, "Canon EF 85mm f/1.2L USM" }, + { 136, "Tamron SP 15-30mm f/2.8 Di VC USD A012" }, // 1 + { 137, "Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens" }, { 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1 { 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2 { 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM" }, // 3 @@ -926,49 +920,49 @@ namespace Exiv2 { { 140, "Canon EF 500mm f/4.5L USM" }, { 141, "Canon EF 500mm f/4.5L USM" }, { 142, "Canon EF 300mm f/2.8L IS USM" }, - { 143, "Canon EF 500mm f/4L IS USM" }, + { 143, "Canon EF 500mm f/4L IS USM or Sigma Lens" }, { 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1 - { 143, "Sigma 24-105mm F4 DG OS HSM | A" }, // 2 + { 143, "Sigma 24-105mm F4 DG OS HSM [Art 013]" }, // 2 { 144, "Canon EF 35-135mm f/4-5.6 USM" }, { 145, "Canon EF 100-300mm f/4.5-5.6 USM" }, { 146, "Canon EF 70-210mm f/3.5-4.5 USM" }, { 147, "Canon EF 35-135mm f/4-5.6 USM" }, { 148, "Canon EF 28-80mm f/3.5-5.6 USM" }, { 149, "Canon EF 100mm f/2 USM" }, - { 150, "Canon EF 14mm f/2.8L USM" }, + { 150, "Canon EF 14mm f/2.8L USM or Sigma Lens" }, { 150, "Sigma 20mm EX f/1.8" }, // 1 { 150, "Sigma 30mm f/1.4 DC HSM" }, // 2 { 150, "Sigma 24mm f/1.8 DG Macro EX" }, // 3 { 150, "Sigma 28mm f/1.8 DG Macro EX" }, // 4 { 150, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 5 { 151, "Canon EF 200mm f/2.8L USM" }, - { 152, "Canon EF 300mm f/4L IS USM" }, + { 152, "Canon EF 300mm f/4L IS USM or Sigma Lens" }, { 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM" }, // 1 { 152, "Sigma 14mm f/2.8 EX Aspherical HSM" }, // 2 { 152, "Sigma 10-20mm f/4-5.6" }, // 3 { 152, "Sigma 100-300mm f/4" }, // 4 { 152, "Sigma 300-800mm f/5.6 APO EX DG HSM" }, // 5 - { 153, "Canon EF 35-350mm f/3.5-5.6L USM" }, + { 153, "Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens" }, { 153, "Sigma 50-500mm f/4-6.3 APO HSM EX" }, // 1 { 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro" }, // 2 - { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"}, // 3 + { 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"}, // 3 { 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro" }, // 4 - { 154, "Canon EF 20mm f/2.8 USM" }, + { 154, "Canon EF 20mm f/2.8 USM or Zeiss Lens" }, { 154, "Zeiss Milvus 21mm f/2.8" }, // 1 { 154, "Zeiss Milvus 15mm f/2.8 ZE" }, // 2 { 154, "Zeiss Milvus 18mm f/2.8 ZE" }, // 3 - { 155, "Canon EF 85mm f/1.8 USM" }, + { 155, "Canon EF 85mm f/1.8 USM or Sigma Lens" }, { 155, "Sigma 14mm f/1.8 DG HSM | A" }, // 1 - { 156, "Canon EF 28-105mm f/3.5-4.5 USM" }, + { 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens" }, { 156, "Tamron SP 70-300mm f/4-5.6 Di VC USD" }, // 1 { 156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 2 - { 160, "Canon EF 20-35mm f/3.5-4.5 USM" }, + { 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens" }, { 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1 { 160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4" }, // 2 { 160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye" }, // 3 { 160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8" }, // 4 { 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8" }, // 5 - { 161, "Canon EF 28-70mm f/2.8L USM" }, + { 161, "Canon EF 28-70mm f/2.8L USM or Other Lens" }, { 161, "Sigma 24-70mm f/2.8 EX" }, // 1 { 161, "Sigma 28-70mm f/2.8 EX" }, // 2 { 161, "Sigma 24-60mm f/2.8 EX DG" }, // 3 @@ -983,9 +977,9 @@ namespace Exiv2 { { 165, "Canon EF 70-200mm f/2.8L USM" }, { 166, "Canon EF 70-200mm f/2.8L USM + 1.4x" }, { 167, "Canon EF 70-200mm f/2.8L USM + 2x" }, - { 168, "Canon EF 28mm f/1.8 USM" }, + { 168, "Canon EF 28mm f/1.8 USM or Sigma Lens" }, { 168, "Sigma 50-100mm f/1.8 DC HSM | A" }, // 1 - { 169, "Canon EF 17-35mm f/2.8L USM" }, + { 169, "Canon EF 17-35mm f/2.8L USM or Sigma Lens" }, { 169, "Sigma 18-200mm f/3.5-6.3 DC OS" }, // 1 { 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical" }, // 2 { 169, "Sigma 18-50mm f/2.8 Macro" }, // 3 @@ -995,21 +989,20 @@ namespace Exiv2 { { 169, "Sigma 35mm f/1.4 DG HSM" }, // 7 { 169, "Sigma 35mm f/1.5 FF High-Speed Prime | 017" }, // 8 { 169, "Sigma 70mm f/2.8 Macro EX DG" }, // 9 - { 170, "Canon EF 200mm f/2.8L II USM" }, + { 170, "Canon EF 200mm f/2.8L II USM or Sigma Lens" }, { 170, "Sigma 300mm f/2.8 APO EX DG HSM" }, // 1 { 170, "Sigma 800mm f/5.6 APO EX DG HSM" }, // 2 { 171, "Canon EF 300mm f/4L USM" }, - { 172, "Canon EF 400mm f/5.6L USM" }, + { 172, "Canon EF 400mm f/5.6L USM or Sigma Lens" }, { 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1 { 172, "Sigma 500mm f/4.5 APO EX DG HSM" }, // 2 - { 173, "Canon EF 180mm Macro f/3.5L USM" }, + { 173, "Canon EF 180mm Macro f/3.5L USM or Sigma Lens" }, { 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1 - { 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 2 - { 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3 - { 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4 - { 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5 - { 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 6 - { 174, "Canon EF 135mm f/2L USM" }, + { 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 2 + { 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 3 + { 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 4 + { 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 5 + { 174, "Canon EF 135mm f/2L USM or Other Lens" }, { 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1 { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2 { 174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM" }, // 3 @@ -1024,7 +1017,7 @@ namespace Exiv2 { { 177, "Canon EF 300mm f/4L IS USM" }, { 178, "Canon EF 28-135mm f/3.5-5.6 IS" }, { 179, "Canon EF 24mm f/1.4L USM" }, - { 180, "Canon EF 35mm f/1.4L USM" }, + { 180, "Canon EF 35mm f/1.4L USM or Other Lens" }, { 180, "Sigma 50mm f/1.4 DG HSM | A" }, // 1 { 180, "Sigma 24mm f/1.4 DG HSM | A" }, // 2 { 180, "Zeiss Milvus 50mm f/1.4" }, // 3 @@ -1035,11 +1028,11 @@ namespace Exiv2 { { 180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017" }, // 8 { 180, "Tokina Opera 50mm f/1.4 FF" }, // 9 { 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 10 - { 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x" }, + { 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens" }, { 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x" }, // 1 - { 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x" }, + { 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens" }, { 182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x" }, // 1 - { 183, "Canon EF 100-400mm f/4.5-5.6L IS USM" }, + { 183, "Canon EF 100-400mm f/4.5-5.6L IS USM or Sigma Lens" }, { 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro" }, // 1 { 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro" }, // 2 { 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 3 @@ -1054,15 +1047,15 @@ namespace Exiv2 { { 188, "Canon EF 70-200mm f/4L USM + 2x" }, { 189, "Canon EF 70-200mm f/4L USM + 2.8x" }, { 190, "Canon EF 100mm f/2.8 Macro USM" }, - { 191, "Canon EF 400mm f/4 DO IS" }, + { 191, "Canon EF 400mm f/4 DO IS or Sigma Lens" }, { 191, "Sigma 500mm f/4 DG OS HSM" }, // 1 { 193, "Canon EF 35-80mm f/4-5.6 USM" }, { 194, "Canon EF 80-200mm f/4.5-5.6 USM" }, { 195, "Canon EF 35-105mm f/4.5-5.6 USM" }, { 196, "Canon EF 75-300mm f/4-5.6 USM" }, - { 197, "Canon EF 75-300mm f/4-5.6 IS USM" }, - { 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HSM" }, // 1 - { 198, "Canon EF 50mm f/1.4 USM" }, + { 197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens" }, + { 197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS" }, // 1 + { 198, "Canon EF 50mm f/1.4 USM or Other Lens" }, { 198, "Zeiss Otus 55mm f/1.4 ZE" }, // 1 { 198, "Zeiss Otus 85mm f/1.4 ZE" }, // 2 { 198, "Zeiss Milvus 25mm f/1.4" }, // 3 @@ -1078,7 +1071,7 @@ namespace Exiv2 { { 210, "Canon EF 28-90mm f/4-5.6 USM" }, { 211, "Canon EF 28-200mm f/3.5-5.6 USM" }, { 212, "Canon EF 28-105mm f/4-5.6 USM" }, - { 213, "Canon EF 90-300mm f/4.5-5.6 USM" }, + { 213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens" }, { 213, "Tamron SP 150-600mm f/5-6.3 Di VC USD" }, // 1 { 213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro" }, // 2 { 213, "Tamron SP 35mm f/1.8 Di VC USD" }, // 3 @@ -1094,19 +1087,19 @@ namespace Exiv2 { { 228, "Canon EF 28-105mm f/3.5-4.5 USM" }, { 229, "Canon EF 16-35mm f/2.8L USM" }, { 230, "Canon EF 24-70mm f/2.8L USM" }, - { 231, "Canon EF 17-40mm f/4L USM" }, + { 231, "Canon EF 17-40mm f/4L USM or Sigma Lens" }, { 231, "Sigma 12-24mm f/4 DG HSM A016" }, // 1 { 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM" }, { 233, "Canon EF 28-300mm f/3.5-5.6L IS USM" }, - { 234, "Canon EF-S 17-85mm f/4-5.6 IS USM" }, + { 234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens" }, { 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4" }, // 1 { 235, "Canon EF-S 10-22mm f/3.5-4.5 USM" }, { 236, "Canon EF-S 60mm f/2.8 Macro USM" }, { 237, "Canon EF 24-105mm f/4L IS USM" }, { 238, "Canon EF 70-300mm f/4-5.6 IS USM" }, - { 239, "Canon EF 85mm f/1.2L II USM" }, + { 239, "Canon EF 85mm f/1.2L II USM or Rokinon Lens" }, { 239, "Rokinon SP 85mm f/1.2" }, // 1 - { 240, "Canon EF-S 17-55mm f/2.8 IS USM" }, + { 240, "Canon EF-S 17-55mm f/2.8 IS USM or Sigma Lens" }, { 240, "Sigma 17-50mm f/2.8 EX DC OS HSM" }, // 1 { 241, "Canon EF 50mm f/1.2L USM" }, { 242, "Canon EF 70-200mm f/4L IS USM" }, @@ -1115,13 +1108,13 @@ namespace Exiv2 { { 245, "Canon EF 70-200mm f/4L IS USM + 2.8x" }, { 246, "Canon EF 16-35mm f/2.8L II USM" }, { 247, "Canon EF 14mm f/2.8L II USM" }, - { 248, "Canon EF 200mm f/2L IS USM" }, + { 248, "Canon EF 200mm f/2L IS USM or Sigma Lens" }, { 248, "Sigma 24-35mm f/2 DG HSM | A" }, // 1 { 248, "Sigma 135mm f/2 FF High-Speed Prime | 017" }, // 2 { 248, "Sigma 24-35mm f/2.2 FF Zoom | 017" }, // 3 { 248, "Sigma 135mm f/1.8 DG HSM A017" }, // 4 { 249, "Canon EF 800mm f/5.6L IS USM" }, - { 250, "Canon EF 24mm f/1.4L II USM" }, + { 250, "Canon EF 24mm f/1.4L II USM or Sigma Lens" }, { 250, "Sigma 20mm f/1.4 DG HSM | A" }, // 1 { 250, "Sigma 20mm f/1.5 FF High-Speed Prime | 017" }, // 2 { 250, "Tokina Opera 16-28mm f/2.8 FF" }, // 3 @@ -1132,11 +1125,11 @@ namespace Exiv2 { { 252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x" }, // 1 { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" }, { 253, "Canon EF 70-200mm f/2.8L IS III USM + 2x" }, // 1 - { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 1 - { 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 2 - { 255, "Sigma 24-105mm f/4 DG OS HSM | A" }, + { 254, "Canon EF 100mm f/2.8L Macro IS USM" }, + { 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 1 + { 255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens" }, { 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1 - { 368, "Sigma 14-24mm f/2.8 DG HSM | A" }, + { 368, "Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens" }, { 368, "Sigma 20mm f/1.4 DG HSM | A" }, // 1 { 368, "Sigma 50mm f/1.4 DG HSM | A" }, // 2 { 368, "Sigma 40mm f/1.4 DG HSM | A" }, // 3 @@ -1150,40 +1143,38 @@ namespace Exiv2 { { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM" }, { 489, "Canon EF 70-300mm f/4-5.6L IS USM" }, { 490, "Canon EF 8-15mm f/4L Fisheye USM" }, - { 491, "Canon EF 300mm f/2.8L IS II USM" }, - { 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2" }, // 1 - { 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD" }, // 2 - { 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD" }, // 3 - { 491, "Tamron 70-210mm f/4 Di VC USD" }, // 4 - { 491, "Tamron 70-210mm f/4 Di VC USD + 1.4x" }, // 5 - { 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2" }, // 6 + { 491, "Canon EF 300mm f/2.8L IS II USM or Tamron Lens" }, + { 491, "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)" }, // 1 + { 491, "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)" }, // 2 + { 491, "Tamron 100-400mm f/4.5-6.3 Di VC USD (A035)" }, // 3 + { 491, "Tamron 70-210mm f/4 Di VC USD (A034)" }, // 4 + { 491, "Tamron 70-210mm f/4 Di VC USD (A034) + 1.4x" }, // 5 + { 491, "Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)" }, // 6 { 492, "Canon EF 400mm f/2.8L IS II USM" }, - { 493, "Canon EF 500mm f/4L IS II USM" }, + { 493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM" }, { 493, "Canon EF 24-105mm f/4L IS USM" }, // 1 { 494, "Canon EF 600mm f/4L IS II USM" }, - { 495, "Canon EF 24-70mm f/2.8L II USM" }, - { 495, "Sigma 24-70mm f/2.8 DG OS HSM | A" }, // 1 + { 495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens" }, + { 495, "Sigma 24-70mm F2.8 DG OS HSM | A" }, // 1 { 496, "Canon EF 200-400mm f/4L IS USM" }, { 499, "Canon EF 200-400mm f/4L IS USM + 1.4x" }, - { 502, "Canon EF 28mm f/2.8 IS USM" }, - { 502, "Tamron 35mm f/1.8 Di VC USD" }, // 1 + { 502, "Canon EF 28mm f/2.8 IS USM or Tamron Lens" }, + { 502, "Tamron 35mm f/1.8 Di VC USD (F012)" }, // 1 { 503, "Canon EF 24mm f/2.8 IS USM" }, { 504, "Canon EF 24-70mm f/4L IS USM" }, { 505, "Canon EF 35mm f/2 IS USM" }, { 506, "Canon EF 400mm f/4 DO IS II USM" }, { 507, "Canon EF 16-35mm f/4L IS USM" }, - { 508, "Canon EF 11-24mm f/4L USM" }, + { 508, "Canon EF 11-24mm f/4L USM or Tamron Lens" }, { 508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD" }, // 1 - { 624, "Sigma 70-200mm f/2.8 DG OS HSM | S" }, - { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM" }, + { 624, "Sigma 70-200mm F2.8 DG OS HSM | S" }, + { 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens" }, { 747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2" }, // 1 - { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x" }, - { 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 1.4x" }, // 1 - { 748, "Tamron 70-210mm f/4 Di VC USD + 2x" }, // 2 - { 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD + 2x" }, + { 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"}, + { 748, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x" }, // 1 + { 748, "Tamron 70-210mm f/4 Di VC USD (A034) + 2x" }, // 2 + { 749, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x" }, { 750, "Canon EF 35mm f/1.4L II USM" }, - { 750, "Tamron SP 85mm f/1.8 Di VC USD" }, // 1 - { 750, "Tamron SP 45mm f/1.8 Di VC USD" }, // 2 { 751, "Canon EF 16-35mm f/2.8L III USM" }, { 752, "Canon EF 24-105mm f/4L IS II USM" }, { 753, "Canon EF 85mm f/1.4L IS USM" }, @@ -1192,7 +1183,7 @@ namespace Exiv2 { { 758, "Canon EF 600mm f/4L IS III USM" }, { 1136, "Sigma 24-70mm f/2.8 DG OS HSM | Art 017" }, { 4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM" }, - { 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM" }, + { 4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens" }, { 4143, "Tamron 18-200mm f/3.5-6.3 Di III VC" }, // 1 { 4144, "Canon EF 40mm f/2.8 STM" }, { 4145, "Canon EF-M 22mm f/2 STM" }, @@ -1210,7 +1201,6 @@ namespace Exiv2 { { 4158, "Canon EF-S 18-55mm f/4-5.6 IS STM" }, { 4159, "Canon EF-M 32mm f/1.4 STM" }, { 4160, "Canon EF-S 35mm f/2.8 Macro IS STM" }, - { 4208, "Sigma 56mm f/1.4 DC DN | C" }, {36910, "Canon EF 70-300mm f/4-5.6 IS II USM" }, {36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM" }, {61491, "Canon CN-E 14mm T3.1 L F" }, @@ -1218,14 +1208,12 @@ namespace Exiv2 { {61494, "Canon CN-E 85mm T1.3 L F" }, {61495, "Canon CN-E 135mm T2.2 L F" }, {61496, "Canon CN-E 35mm T1.5 L F" }, - {61182, "Canon RF 35mm F1.8 Macro IS STM" }, + {61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens" }, {61182, "Canon RF 50mm F1.2 L USM" }, // 1 {61182, "Canon RF 24-105mm F4 L IS USM" }, // 2 {61182, "Canon RF 28-70mm F2 L USM" }, // 3 {61182, "Canon RF 85mm F1.2L USM" }, // 4 {61182, "Canon RF 24-240mm F4-6.3 IS USM" }, // 5 - {61182, "Canon RF 24-70mm F2.8 L IS USM" }, // 6 - {61182, "Canon RF 15-35mm F2.8 L IS USM" }, // 7 {65535, "n/a" } }; diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out index ab2e49bd..2fbc7281 100644 --- a/test/data/exiv2-test.out +++ b/test/data/exiv2-test.out @@ -1890,7 +1890,7 @@ File 14/15: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM +20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -3502,7 +3502,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected < 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) < 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM +< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens < 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm < 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 < 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -5043,7 +5043,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected > 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) > 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0 -> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM +> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens > 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm > 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8 > 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22 @@ -6804,7 +6804,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected < 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) < 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0 -< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM +< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens < 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm < 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8 < 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22 @@ -8345,7 +8345,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected > 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av) > 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0 -> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM +> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens > 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm > 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8 > 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22 diff --git a/test/functions.source b/test/functions.source index ad73eb43..40eb08dd 100644 --- a/test/functions.source +++ b/test/functions.source @@ -11,7 +11,7 @@ runTest() if [ ! -z $EXIV2_ECHO ]; then echoTest $VALGRIND $bin$prog "$@" fi - $VALGRIND $bin$prog$exe "$@" + $VALGRIND $bin$prog "$@" ) } @@ -37,7 +37,7 @@ existsTest() result=1 fi else - if [ -e $bin$prog -o -e $bin$prog$exe ]; then + if [ -e $bin$prog -o -e $bin$prog.exe ]; then result=1 fi fi @@ -464,10 +464,6 @@ prepareTest() if [ "$PLATFORM" == cygwin -o "$PLATFORM" == mingw ]; then exe=.exe fi - - if [ ! -z $EXIV2_EXT ]; then - exe=$EXIV2_EXT - fi if [ "$PLATFORM" == cygwin ]; then # We need a private version of diff for linux compatibility diff --git a/test/path-test.sh b/test/path-test.sh index 8d9ac192..c7e03a82 100755 --- a/test/path-test.sh +++ b/test/path-test.sh @@ -4,13 +4,13 @@ source ./functions.source ( cd "$testdir" - if [ $(existsTest pathtest) == 1 ] ; then + if [ $(existsTest path-test) == 1 ] ; then copyTestFile path-test.txt - runTest pathtest path-test.txt + runTest path-test path-test.txt else echo "$0: path-test executable not found. Skipping path tests." fi ) # That's all Folks! -## +## \ No newline at end of file diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh index 2d56fd1b..db9c7933 100755 --- a/test/xmpparser-test.sh +++ b/test/xmpparser-test.sh @@ -17,13 +17,13 @@ fi for f in ${files[@]} ; do runTest xmpparser-test $f - diff $diffargs $f ${f}-new + diff $f ${f}-new done testfile=xmpsdk.xmp runTest xmpparse ${testfile} > t1 2>&1 runTest xmpparse ${testfile}-new > t2 2>&1 - diff $diffargs t1 t2 + diff t1 t2 # ---------------------------------------------------------------------- # xmpsample diff --git a/tests/bugfixes/github/test_issue_20.py b/tests/bugfixes/github/test_issue_20.py index 2bf20782..1733dc02 100644 --- a/tests/bugfixes/github/test_issue_20.py +++ b/tests/bugfixes/github/test_issue_20.py @@ -5,7 +5,7 @@ import system_tests class TamronSupport(metaclass=system_tests.CaseMeta): - description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'" + description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'" files = [ "exiv2-g20.exv", @@ -36,7 +36,7 @@ Exif.Photo.LensSerialNumber Ascii 12 0000000000 """, # TamronSP15-30mmF2.8DiVCUSDA012.exv" - """Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD + """Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD A012 """, # TamronSP90mmF2.8DiVCUSDMacroF004.exv diff --git a/tests/bugfixes/github/test_issue_45.py b/tests/bugfixes/github/test_issue_45.py index ca7ca1d4..16727b26 100644 --- a/tests/bugfixes/github/test_issue_45.py +++ b/tests/bugfixes/github/test_issue_45.py @@ -9,7 +9,7 @@ class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-g45.exv" commands = ["$exiv2 -pa --grep lens/i " + filename] - stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM | A + stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM [Art 013] Exif.CanonCs.Lens Short 3 24.0 - 105.0 mm Exif.CanonCf.LensAFStopButton Short 1 0 Exif.Canon.LensModel Ascii 74 24-105mm F4 DG OS HSM | Art 013 From 84dd66fef4d0d31c71dd6d281d3cd312f083abdf Mon Sep 17 00:00:00 2001 From: Sridhar Boovaraghavan Date: Wed, 22 Apr 2020 11:07:35 +0530 Subject: [PATCH 11/13] Updated documentation --- contrib/vs2019/README.md | 213 ++++++++++++++++++++++++++------------- 1 file changed, 145 insertions(+), 68 deletions(-) diff --git a/contrib/vs2019/README.md b/contrib/vs2019/README.md index 8705be80..cd13ebdd 100644 --- a/contrib/vs2019/README.md +++ b/contrib/vs2019/README.md @@ -1,27 +1,12 @@ # exiv2-x86_x64 Visual Studio project files to compile exiv2 on Windows (x86/x64/Release/Debug) -# Motivation # -I use Visual Studio on Windows for my personal product development. I -needed to use exiv2 for a project to sync my photographs in -[Picasa](https://picasa.google.com/)[^1] to -[Piwigo](https://github.com/Piwigo/). I use Piwigo, running on my own -server, because I do not want to share my family photographs in -platforms like facebook, google photos, instagram, whatsapp etc. For -the same privacy concerns, this piwigo gallery on my server is not -public and is accessed through credentials shared only with family. - ## Background ## -I started this project quite a while ago (mid-2016). I got it to a -working state by the end of 2019, mostly because it has been hard to -find solid time to devote to this. Needless to say, there was nothing -that did exactly what I wanted and few other projects that did some of -what I needed. I borrowed liberally to cobble up this solution. - -One of the main building blocks was exiv2. When I started this -project, support for building on Windows using Visual Studio was quite -good and in particular, [Robin Mills](https://github.com/clanmills), -the then maintainer, was excellent in helping resolve questions. +One of the main building blocks for a personal product that I was +developing was exiv2. When I started this project, support for +building on Windows using Visual Studio was quite good and in +particular, [Robin Mills](https://github.com/clanmills), the then +maintainer, was excellent in helping resolve questions. However, as time progressed, the maintainers changed and their primary focus turned to Linux and Windows compilation was an afterthought @@ -45,10 +30,6 @@ utility of the product is diminished. This project is to help people who would like to build exiv2 using Visual Studio on Windows, to do so. -**Note** As the code in the master exiv2 repository changes, these -project files may not work out of the box. However, with small -changes, they could be made to work with the latest. - ## Building Philosophy ## Unlike the linux-style philosophy of installing everything in and then, linking from, /usr/local-type folders, typically source trees on @@ -82,12 +63,149 @@ expat-static project is added as a reference to the exiv2 project. This make Visual Studio generate the correct dependency heirarchy and compile correctly. +# Folder Structure # + +Because these are project files that are pre-generated, they expect +exiv2 and its dependencies to be placed in a certain hierarchy. + +Each of the dependencies will have to be placed at the same level as +the exiv2 source tree. + +For e.g. + +C:\Sources\exiv2 +C:\Sources\zlib +C:\Sources\openssl +C:\Sources\libssh2 + +and so on. The requirement that it be at the same level as the exiv2 +source tree is only mandated in a relative sense. That is, you could +have your exiv2 sources in C:\Sources or E:\Projects or +C:\Users\Sridhar\Documents\VS\exiv2. There are problems with spaces in +directory names, because there are some commands executed through +utilities like perl which may not handle them well. Please don't use +spaces. + +## VS solution/projects for dependencies ## + +Just like the solution/project file to compile exiv2 in VS (the one +that you are reading about now), most dependencies also have similar +VS solution/project files, because their VS-build infrastructure is +deficient. Specific instructions on fetching these project files +separately and copying them to the source tree is given below for each +dependency. I fetch these *-x86_x64 repositories into a separate +folder from these other source folders. For e.g., I keep these in +E:\Projects\github. Whereas the sources are in E:\Projects. + +Theoretically, just fetching these dependency sources, placing them in +the correct folder hierarchies, fetching their associated VS project +files and placing them in the source tree in specific folders +(detailed below) should be enough to compile exiv2 directly. exiv2 +links against static libraries of these dependencies. However, these +dependencies are full-fledged distributions that contain, apart from +those libraries that exiv2 needs, other executables and tests. These +can be compiled, optionally, if one needs to test the integrity of +those projects. + +## Dependency Order ## + +Some of these dependencies depend on other dependencies. Thus, it is +best if they are executed in the order shown below. + +# Dependencies # + * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com) + * [NASM, used 2.14.02 x64](https://www.nasm.us/) + * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/) + * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git) + * Optionally, switch the git tree to the 1.2.11 branch. + * Use my [zlib-x86_x64](https://github.com/sridharb1/zlib-x86_x64) + to compile on Windows using Visual Studio + * Copy the contents of this folder into the contrib folder + of the zlib repository. Thus, the contrib/vc14 folder of + zlib-x86_x64 should overwrite the same in zlib. + * Optionally, use zlibvc.sln to compile. + * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat) + * Optionally, switch the git tree to the R_2_2_9 branch. + * Use my + [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64) + to compile on Windows using Visual Studio + * Copy the build folder of libexpat-x86_x64 into the libexpat + source tree. + * Optionally, use expat.sln to compile. + * [OpenSSL, tested w/ v1.1.1g-DEV](https://github.com/openssl/openssl) + * Optionally, switch the git tree to the OpenSSL_1_1_1-stable branch. + * Use my + [openssl-x86_x64](https://github.com/sridharb1/openssl-x86_x64) + to compile on Windows using Visual Studio + * Copy the build folder of openssl-x86_x64 into the openssl tree. + * Optionally, use openssl1_1.sln to compile. + * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/) + * Optionally, switch the git tree to the stable-0.9 branch. + * Use my + [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git) + to compile on Windows using Visual Studio + * Copy the build folder of libssh-x86_x64 into the libssh source tree. + * Optionally, use libssh.sln to compile. + * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git) + * Optionally, switch the git tree to the libssh2-1.9.0 branch. + * Use my + [libssh2-x86_x64](https://github.com/sridharb1/libssh2-x86_x64.git) + to compile on Windows using Visual Studio + * Copy the build folder of libssh2-x86_x64 into the libssh2 source tree. + * Optionally, use libssh2.sln to compile. + * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli) + * Use my + [brotli-x86_x64](https://github.com/sridharb1/brotli-x86_x64.git) + to compile on Windows using Visual Studio + * Copy the build_folder folder of brotli-x86_x64 into the brotli source tree. + * Optionally, use brotli.sln to compile. + * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git) + * Optionally, switch the git tree to the 7_69_1 branch. + * Use my + [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git) + to compile on Windows using Visual Studio + * Copy the contents of this folder into the **projects/Windows/VC15** + folder of the curl source tree. *Note: instructions different + from other projects* + * Optionally, use curl_all.sln to compile. + * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8] + * Optionally, switch the git tree to the v1.10.x branch. + * Use my + [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git) + to compile on Windows using Visual Studio + * Copy the build folder of googletest-x86_x64 into the googletest source tree. + * Optionally, use googletest-distribution.sln to compile. + * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git) + * When you clone gettext, you might also clone a submodule called + gnulib. This is not necessary. You can turn off the recursive + flag while cloning. + * Optionally, switch the git tree to the 0.20.1 branch. + * Use my + [gettext-x86_x64](https://github.com/sridharb1/gettext-x86_x64) + to compile on Windows using Visual Studio + * Copy the build folder into the root folder of gettext source tree. + * Optionally, use gettext.sln to compile. + * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64) + * This dependency is a little different from the others in the + sense that in the others, you fetch the source and the VS + project files separately. In this case, this repository provides + both the source and the VS project files. + * Optionally, use libiconv.sln to compile. + # Sources # * [Exiv2, tested w/ v0.27.2](https://github.com/Exiv2/exiv2) * In v0.27.3, my solution/project files can be found in contrib/vs2019/solution - * For other versions, use my [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to compile on Windows - * Place the contents of exiv2-x86_x64 in a folder called contrib/vs2019/solution in the exiv2 repository and build using the provided solution. Please note that the dependencies listed below are needed. - * `exiv2 -vV` + * For other versions, use my + [exiv2-x86_x64](https://github.com/sridharb1/exiv2-x86_x64) to + compile on Windows + * It may, in particular, not work for the HEAD or 0.28+ branches as + there have been incompatible changes made, that have not been + incorporated in these project files. + * Place the contents of exiv2-x86_x64 in a folder called + contrib/vs2019/solution in the exiv2 repository and build using + the provided solution. Please note that the dependencies listed + above are needed. + * `exiv2 -vV` (output of generated exiv2.exe on my machine for reference) ``` shell exiv2 0.27.2 @@ -250,44 +368,3 @@ heirarchy and compile correctly. xmlns=xmpTPg:http://ns.adobe.com/xap/1.0/t/pg/ xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/ ``` - -# Dependencies # - * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git)[^12] - * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com)[^2] - * [NASM, used 2.14.02 x64](https://www.nasm.us/)[^3] - * [libexpat, tested w/ v2.2.9](https://github.com/libexpat/libexpat)[^4] - * [OpenSSL, tested w/ v1.1.1g-DEV](https://github.com/openssl/openssl)[^5] - * [libssh, tested w/ v0.9.3](https://git.libssh.org/projects/libssh.git/)[^10] - * [libssh2, tested w/ v1.9.0](https://github.com/libssh2/libssh2.git)[^6] - * [brotli, tested w/ v1.0.7+](https://github.com/google/brotli)[^11] - * [curl, tested w/ v7.69.1](https://github.com/curl/curl.git)[^7] - * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8] - * [libintl (aka gettext), tested with v0.20.1](https://git.savannah.gnu.org/git/gettext.git)[^9] - * [libiconv, tested w/ v1.16](https://github.com/sridharb1/libiconv-x86_x64) - * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/) - -[^1]: It has since been killed by google. (You can find the last released version here: [Picasa 3.9.141, build 259](https://1drv.ms/u/s!AuE8ZYzPkfMfiEzdlKtVVjN-MReT)) - -[^2]: I installed the binary distribution. perl is only used by the -openssl makefile to generate the initial configuration. Even this is -not necessary if the configuration that I chose applies to you. - -[^3]: Binary distribution. See [^2]. - -[^4]: Use my [libexpat-x86_x64](https://github.com/sridharb1/libexpat-x86_x64) to compile on Windows using Visual Studio - -[^5]: Use my [openssl-x86_x64](https://github.com/sridharb1/openssl-x86_x64) to compile on Windows using Visual Studio - -[^6]: Use my [libssh2-x86_x64](https://github.com/sridharb1/libssh2-x86_x64.git) to compile on Windows using Visual Studio - -[^7]: Use my [curl-x86_x64](https://github.com/sridharb1/curl-x86_x64.git) to compile on Windows using Visual Studio - -[^8]: Use my [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git) to compile on Windows using Visual Studio - -[^9]: Use my [gettext-x86_x64](https://github.com/sridharb1/gettext-x86_x64) to compile on Windows using Visual Studio - -[^10]: Use my [libssh-x86_x64](https://github.com/sridharb1/libssh-x86_x64.git) to compile on Windows using Visual Studio - -[^11]: Use my [brotli-x86_x64](https://github.com/sridharb1/brotli-x86_x64)to compile on Windows using Visual Studio - -[^12]: Use my [zlib-x86_x64](https://github.com/sridharb1/zlib-x86_x64)to compile on Windows using Visual Studio From 42cc07d907d59652b32903f878ce04fdcdeffd5c Mon Sep 17 00:00:00 2001 From: Sridhar Boovaraghavan Date: Wed, 22 Apr 2020 11:17:09 +0530 Subject: [PATCH 12/13] Minor formatting issues. --- contrib/vs2019/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/vs2019/README.md b/contrib/vs2019/README.md index cd13ebdd..0d482774 100644 --- a/contrib/vs2019/README.md +++ b/contrib/vs2019/README.md @@ -73,10 +73,10 @@ the exiv2 source tree. For e.g. -C:\Sources\exiv2 -C:\Sources\zlib -C:\Sources\openssl -C:\Sources\libssh2 + C:\Sources\exiv2 + C:\Sources\zlib + C:\Sources\openssl + C:\Sources\libssh2 and so on. The requirement that it be at the same level as the exiv2 source tree is only mandated in a relative sense. That is, you could @@ -115,7 +115,7 @@ best if they are executed in the order shown below. # Dependencies # * [Strawberry Perl, used v5.30.1.1 x64](strawberryperl.com) * [NASM, used 2.14.02 x64](https://www.nasm.us/) - * [Visual Studio, used Community 2019 edition](https://visualstudio.microsoft.com/) + * [Visual Studio, used Community 2019 edition, v16.5.4](https://visualstudio.microsoft.com/) * [zlib, tested w/ v1.2.11](https://github.com/madler/zlib.git) * Optionally, switch the git tree to the 1.2.11 branch. * Use my [zlib-x86_x64](https://github.com/sridharb1/zlib-x86_x64) @@ -168,7 +168,7 @@ best if they are executed in the order shown below. folder of the curl source tree. *Note: instructions different from other projects* * Optionally, use curl_all.sln to compile. - * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git)[^8] + * [googletest, tested w/ v1.10.x](https://github.com/google/googletest.git) * Optionally, switch the git tree to the v1.10.x branch. * Use my [googletest-x86_x64](https://github.com/sridharb1/googletest-x86_x64.git) From bd6645fad4f0418453e8bd0bc581b6acd856433e Mon Sep 17 00:00:00 2001 From: Sridhar Boovaraghavan Date: Wed, 22 Apr 2020 11:19:43 +0530 Subject: [PATCH 13/13] Removed LICENSE --- contrib/vs2019/LICENSE | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 contrib/vs2019/LICENSE diff --git a/contrib/vs2019/LICENSE b/contrib/vs2019/LICENSE deleted file mode 100644 index 81fe56ef..00000000 --- a/contrib/vs2019/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Sridhar Boovaraghavan GitHub Handle: sridharb1 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.