diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..06c5d3b1
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,40 @@
+contrib/vs2019 @sridharb1
+
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+# # This is a comment.
+# # Each line is a file pattern followed by one or more owners.
+#
+# # These owners will be the default owners for everything in
+# # the repo. Unless a later match takes precedence,
+# # @global-owner1 and @global-owner2 will be requested for
+# # review when someone opens a pull request.
+# * @global-owner1 @global-owner2
+#
+# # Order is important; the last matching pattern takes the most
+# # precedence. When someone opens a pull request that only
+# # modifies JS files, only @js-owner and not the global
+# # owner(s) will be requested for a review.
+# *.js @js-owner
+#
+# # You can also use email addresses if you prefer. They'll be
+# # used to look up users just like we do for commit author
+# # emails.
+# *.go docs@example.com
+#
+# # In this example, @doctocat owns any files in the build/logs
+# # directory at the root of the repository and any of its
+# # subdirectories.
+# /build/logs/ @doctocat
+#
+# # The `docs/*` pattern will match files like
+# # `docs/getting-started.md` but not further nested files like
+# # `docs/build-app/troubleshooting.md`.
+# docs/* docs@example.com
+#
+# # In this example, @octocat owns any file in an apps directory
+# # anywhere in your repository.
+# apps/ @octocat
+#
+# # In this example, @doctocat owns any file in the `/docs`
+# # directory in the root of your repository.
+# /docs/ @doctocat
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index d10b8cf9..9a8bffec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
dist: xenial
sudo: required
compiler: gcc
- env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON"
+ env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98"
- os: linux
dist: xenial
@@ -18,18 +18,18 @@ matrix:
compiler: gcc
env:
- WITH_VALGRIND=1
- - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON"
+ - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98"
- os: linux
dist: xenial
sudo: required
compiler: clang
- env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON"
+ env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98"
- os: osx
osx_image: xcode11.3
compiler: clang
- env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON"
+ env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98"
install: ./ci/install.sh
script: ./ci/run.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd77f6d6..5088b10f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,14 @@
cmake_minimum_required( VERSION 3.3.2 )
-project(exiv2
- VERSION 0.27.3.1
+project(exiv2 # use TWEAK to categorize the build
+ VERSION 0.27.3.1 # 0.27.3 = GM
+ # 0.27.3.00 = GM Preview
+ # 0.27.3.09 = Not For Release
+ # 0.27.3.1 = RC1
+ # 0.27.3.10 = RC1 Preview
+ # 0.27.3.19 = RC1 Not for release
LANGUAGES CXX C
)
-
include(cmake/mainSetup.cmake REQUIRED)
# options and their default values
@@ -16,7 +20,7 @@ option( EXIV2_ENABLE_NLS "Build native language support (requires g
option( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON )
option( EXIV2_ENABLE_LENSDATA "Build including lens data" ON )
option( EXIV2_ENABLE_VIDEO "Build video support into library" OFF )
-option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" ON )
+option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" ON )
option( EXIV2_ENABLE_WIN_UNICODE "Use Unicode paths (wstring) on Windows" OFF )
option( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF )
option( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo (WEBREADY)" OFF )
diff --git a/README.md b/README.md
index 1b657a0f..247c9230 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@
14. [Thread Safety](#2-14)
15. [Library Initialisation and Cleanup](#2-15)
16. [Cross Platform Build and Test on Linux for MinGW](#2-16)
+ 17. [Building with C++11 and other compilers](#2-17)
3. [License and Support](#3)
1. [License](#3-1)
2. [Support](#3-2)
@@ -696,6 +697,27 @@ You will find that 3 tests fail at the end of the test suite. It is safe to ign
[TOC](#TOC)
+
+
+### 2.17 Building with C++11 and other compilers
+
+Exiv2 uses the default compiler for your system. Exiv2 v0.27 was written to the C++ 1998 standard and uses auto\_ptr. The C++11 and C++14 compilers will issue deprecation warnings about auto\_ptr. As _auto\_ptr support has been removed from C++17, you cannot build Exiv2 v0.27 with C++17 or later compilers._ Exiv2 v0.28 and later do not use auto\_ptr and will build with modern Standard C++ Compilers.
+
+To generate a build with C++11:
+
+```bash
+$ cd
+$ mkdir build ; cd build
+$ cmake .. -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_FLAGS=-Wno-deprecated
+$ make
+```
+
+The option -DCMAKE\_CXX\_STANDARD=11 specifies the C++ Language Standard. Possible values are 98, 11 or 14.
+
+The option -DCMAKE\_CXX\_FLAGS=-Wno-deprecated suppresses warnings from C++11 concerning auto\_ptr and other deprecated features. **Caution:** Visual Studio users should not use -DCMAKE\_CXX\_FLAGS=-Wno-deprecated.
+
+[TOC](#TOC)
+
## 3 License and Support
@@ -748,7 +770,7 @@ There are different kinds of tests:
**Caution Visual Studio Users using cmd.exe** _You may use `make` to to execute tests in the test directory. To execute tests from the build directory, use `cmake`._ This is discussed in detail below: [Running tests on Visual Studio builds](#4-2)
-Environment Variables used by test suite
+Environment Variables used by the test suite:
| Variable | Default | Platforms | Purpose |
|:-- |:-- |:-- |:-- |
@@ -757,8 +779,9 @@ Environment Variables used by test suite
| EXIV2_HTTP | **http://0.0.0.0** | All Platforms | Test http server |
| EXIV2_EXT | **.exe** | msvc Cygwin MinGW/msys2 | Extension used by executable binaries |
| EXIV2_EXT | _**not set**_ | Linux macOS Unix| |
-| EXIV2_ECHO | _**not set**_ | All Platforms | For debugging Bash scripts |
-| VALGRIND | _**not set**_ | All Platforms | For debugging Bash scripts |
+| EXIV2_ECHO | _**not set**_ | All Platforms | For debugging Bash scripts |
+| VALGRIND | _**not set**_ | All Platforms | For debugging Bash scripts |
+| VERBOSE | _**not set**_ | All Platforms | Causes make to report its actions |
The Variables EXIV2\_PORT or EXIV2\_HTTP can be set to None to skip http tests. The http server is started with the command `python3 -m http.server $port`. On Windows, you will need to run this manually _**One**_ to authorise the firewall to permit python to use the port.
@@ -834,10 +857,11 @@ You can build with Visual Studio using Conan. The is described in detail in [RE
As a summary, the procedure is:
```
-c:\...\exiv2> mkdir build
+c:\...\exiv2>mkdir build
+c:\...\exiv2>cd build
c:\...\exiv2\build>conan install .. --build missing --profile msvc2019Release
c:\...\exiv2\build>cmake .. -DEXIV2_BUILD_UNIT_TESTS=On -G "Visual Studio 16 2019"
-c:\...\exiv2\build>cmake --build . --config release
+c:\...\exiv2\build>cmake --build . --config Release
... lots of output from compiler and linker ...
c:\...\exiv2\build>
```
@@ -851,10 +875,11 @@ c:\...\exiv2\build>copy c:\Python37\python.exe c:\Python37\python3.exe
You must set the environment strings EXIV2\_BINDIR, EXIV2\_EXT and modify PATH. You will need a DOS Python3 interpreter on your path, and you'll need the bash interpreter. By careful to ensure the DOS python3.exe is found before the MingW/msys2 python3.
```
-c:\...\exiv2\build> set EXIV2_BINDIR=%CD%
-c:\...\exiv2\build> set EXIV2_EXT=.exe
-c:\...\exiv2\build\bin> set "PATH=c:\Python37;c:\Python37\Scripts;c:\msys64\usr\bin;%PATH%"
+c:\...\exiv2\build>set EXIV2_BINDIR=%CD%
+c:\...\exiv2\build>set EXIV2_EXT=.exe
+c:\...\exiv2\build\bin>set "PATH=c:\Python37;c:\Python37\Scripts;c:\msys64\usr\bin;%PATH%"
```
+
Move to the test directory and use make (which is in c:\msys64\usr\bin) to drive the test procedures. You cannot run the tests in the build directory because there is no Makefile in the build directory.
```
@@ -879,12 +904,10 @@ set "P=%P%c:\msys64\usr\bin;" # msys2 make, bash etc
set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;"
set "P=%P%c:\Windows\System32;" # windows
set "P=%P%%USERPROFILE%\com;" # my home-made magic
-echo %P%
set "PATH=%P%"
set "EXIV2_EXT=.exe"
-set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin"
-color 0d
-cmd /S /K cd "%EXIV2_BINDIR%\..\.."
+color 1e
+cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
color
endlocal
```
@@ -896,6 +919,19 @@ c:\...\exiv2\test>cd ..\build
c:\...\exiv2\build>cmake --build . --config Release --target tests
```
+If you wish to use an environment variables, use env:
+
+```
+c:\...\exiv2\build>env VERBOSE=1 cmake --build . --config Release --target tests
+```
+
+When you are in the test directory, msys/make provides the following _(more convenient)_ syntax:
+
+```
+c:\...\exiv2\test>make tests VERBOSE=1
+```
+
+
[TOC](#TOC)
@@ -1062,12 +1098,10 @@ set "P=%P%c:\msys64\usr\bin;" # msys2 make, bash etc
set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;"
set "P=%P%c:\Windows\System32;" # windows
set "P=%P%%USERPROFILE%\com;" # my home-made magic
-echo %P%
set "PATH=%P%"
set "EXIV2_EXT=.exe"
-set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin"
-color 0d
-cmd /S /K cd "%EXIV2_BINDIR%\..\.."
+color 1e
+cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
color
endlocal
```
diff --git a/appveyor.yml b/appveyor.yml
index da25fbb5..461d7bf5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,13 +5,14 @@ environment:
PYTHON: "C:/Python37-x64"
matrix:
- - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CMAKE_GENERATOR: Ninja
INTEGRATION_TESTS: 1
- VS_COMPILER_VERSION: 14
- VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
+ VS_COMPILER_VERSION: 16
+ VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
ARCHITECTURE: x86_64
UNIT_TESTS: 1
+ WEBREADY: True
WARNINGS_AS_ERRORS: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMAKE_GENERATOR: Ninja
@@ -20,14 +21,16 @@ environment:
VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
ARCHITECTURE: x86_64
UNIT_TESTS: 1
+ WEBREADY: True
WARNINGS_AS_ERRORS: ON
- - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CMAKE_GENERATOR: Ninja
- INTEGRATION_TESTS: 0
- VS_COMPILER_VERSION: 11
- VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat
+ INTEGRATION_TESTS: 1
+ VS_COMPILER_VERSION: 14
+ VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
ARCHITECTURE: x86_64
UNIT_TESTS: 1
+ WEBREADY: True
WARNINGS_AS_ERRORS: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
CMAKE_GENERATOR: Ninja
@@ -35,8 +38,9 @@ environment:
VS_COMPILER_VERSION: 12
VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
ARCHITECTURE: x86_64
- UNIT_TESTS: 1
- WARNINGS_AS_ERRORS: ON
+ UNIT_TESTS: 0
+ WEBREADY: False
+ WARNINGS_AS_ERRORS: OFF
shallow_clone: true
@@ -45,11 +49,11 @@ install:
- echo %APPVEYOR_BUILD_FOLDER%
- mkdir C:\projects\deps
- cd C:\projects\deps
- - appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -FileName ninja.zip
+ - appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip -FileName ninja.zip
- 7z x ninja.zip -oC:\projects\deps\ninja > nul
- set PATH=C:\projects\deps\ninja;%PATH%
- ninja --version
- - pip.exe install conan==1.24.0
+ - pip.exe install conan==1.24.1
- cd %APPVEYOR_BUILD_FOLDER%
before_build:
@@ -66,9 +70,9 @@ build_script:
- cmd: cd build
- cmd: call "%VCVARS%" x86_amd64
- cmd: conan --version
- - cmd: conan install .. -o webready=True --build missing
+ - cmd: conan install .. -o webready=%WEBREADY% --build missing
- cmd: echo %CMAKE_GENERATOR%
- - cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install ..
+ - cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install ..
- cmd: cmake --build . --config Release
- cmd: cmake --build . --config Release --target install
- cmd: cd bin
@@ -76,3 +80,5 @@ build_script:
- cmd: cd ../../tests/
- cmd: set EXIV2_EXT=.exe
- cmd: if %INTEGRATION_TESTS% == 1 %PYTHON%/python.exe runner.py -v
+ - cmd: cd ../build/bin
+ - cmd: exiv2 --version --verbose
diff --git a/ci/run.sh b/ci/run.sh
index d358fe0f..2a6dfe40 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -6,7 +6,6 @@ set -x
source conan/bin/activate
if [[ "$(uname -s)" == 'Linux' ]]; then
-
if [ "$CC" == "clang" ]; then
# clang + Ubuntu don't like to run with UBSAN, but ASAN works
export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\""
@@ -19,15 +18,13 @@ else
export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
fi
-
-mkdir build && cd build
+mkdir build
+cd build
conan install .. -o webready=True --build missing
-
cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install ..
-make -j2
-
-make tests
-make install
+make -j 2
+make tests
+make install
# Check for detecting issues with the installation of headers
if [ `ls install/include/exiv2/ | wc -l` > 10 ]; then
@@ -37,11 +34,6 @@ else
exit 1
fi
-pushd .
-cd bin
-$EXIV2_VALGRIND ./unit_tests
-popd
-
if [ -n "$COVERAGE" ]; then
bash <(curl -s https://codecov.io/bash)
fi
diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
index 1c5ffab2..0418aa61 100644
--- a/cmake/compilerFlags.cmake
+++ b/cmake/compilerFlags.cmake
@@ -23,8 +23,8 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
if (COMPILER_IS_GCC OR COMPILER_IS_CLANG)
- # This fails under Fedora - MinGW - Gcc 8.3
- if (NOT MINGW AND NOT CMAKE_HOST_SOLARIS)
+ # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
+ if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
add_compile_options(-fstack-clash-protection -fcf-protection)
endif()
@@ -38,7 +38,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
add_compile_options(-Wp,-D_GLIBCXX_ASSERTIONS)
- if (CMAKE_BUILD_TYPE STREQUAL Release AND NOT APPLE)
+ if (CMAKE_BUILD_TYPE STREQUAL Release AND NOT APPLE AND NOT MSYS)
add_compile_options(-Wp,-D_FORTIFY_SOURCE=2) # Requires to compile with -O2
endif()
@@ -90,6 +90,7 @@ endif ()
# http://stackoverflow.com/questions/10113017/setting-the-msvc-runtime-in-cmake
if(MSVC)
+
find_program(CLCACHE name clcache.exe
PATHS ENV CLCACHE_PATH
PATH_SUFFIXES Scripts clcache-4.1.0
@@ -136,4 +137,10 @@ if(MSVC)
# Object Level Parallelism
add_compile_options(/MP)
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
+
+ # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+ if (MSVC_VERSION GREATER_EQUAL "1910") # VS2017 and up
+ add_compile_options("/Zc:__cplusplus")
+ endif()
+
endif()
diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake
index a4d983d4..1f8d10c8 100644
--- a/cmake/mainSetup.cmake
+++ b/cmake/mainSetup.cmake
@@ -18,10 +18,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
endif()
-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS ON)
-
if (UNIX)
if (APPLE)
set(CMAKE_MACOSX_RPATH ON)
diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
index 4636419e..fdc862e8 100644
--- a/cmake/packaging.cmake
+++ b/cmake/packaging.cmake
@@ -89,13 +89,30 @@ if ( MSVC )
endif()
endif()
-# Set RC = Release Candidate
-if ( PROJECT_VERSION_TWEAK STREQUAL "9" )
- set (RC "Not for release")
-elseif ( (PROJECT_VERSION_TWEAK STREQUAL "0") OR (PROJECT_VERSION_TWEAK STREQUAL "") )
- set(RC "GM Release")
+# Set RC = Release Candidate from TWEAK
+if ( PROJECT_VERSION_TWEAK STREQUAL "" )
+ set(RC "GM For Release")
else()
- set ( RC "Release Candidate ${PROJECT_VERSION_TWEAK}" )
+ string(FIND "${PROJECT_VERSION_TWEAK}" 0 PREVIEW_RELEASE ) # 0.27.3.10 => RC1 Preview
+ string(FIND "${PROJECT_VERSION_TWEAK}" 9 NOT_FOR_RELEASE ) # 0.27.3.19 => RC1 Not for release
+ string(SUBSTRING ${PROJECT_VERSION_TWEAK} 0 1 RC)
+ if ( RC STREQUAL "0" )
+ set(RC,"")
+ else()
+ set (RC "RC${RC}")
+ endif()
+ if ( PREVIEW_RELEASE STREQUAL "1" )
+ set (RC "${RC} Preview")
+ set (PREVIEW_RELEASE 1)
+ else()
+ set (PREVIEW_RELEASE 0)
+ endif()
+ if ( NOT_FOR_RELEASE STREQUAL "1" )
+ set (RC "${RC} Not for release")
+ set (NOT_FOR_RELEASE 1)
+ else()
+ set (NOT_FOR_RELEASE 0)
+ endif()
endif()
# Set RV = Release Version
@@ -105,7 +122,6 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VS}
# https://stackoverflow.com/questions/17495906/copying-files-and-including-them-in-a-cpack-archive
install(FILES "${PROJECT_SOURCE_DIR}/samples/exifprint.cpp" DESTINATION "samples")
-install(DIRECTORY "${PROJECT_SOURCE_DIR}/contrib/" DESTINATION "contrib")
# Copy top level documents (eg README.md)
# https://stackoverflow.com/questions/21541707/cpack-embed-text-files
@@ -113,7 +129,7 @@ set( DOCS
README.md
README-CONAN.md
README-SAMPLES.md
- license.txt
+ COPYING
exiv2.png
)
foreach(doc ${DOCS})
@@ -126,6 +142,16 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/build/logs/build.txt)
endif()
# Copy releasenotes.txt and appropriate ReadMe.txt (eg releasenotes/${PACKDIR}/ReadMe.txt)
+set(VM ${PROJECT_VERSION_MAJOR}) # Version Major 0
+set(VN ${PROJECT_VERSION_MINOR}) # Version Minor 27
+set(VD ${PROJECT_VERSION_PATCH}) # Version Dot 3
+set(VR .${PROJECT_VERSION_TWEAK}) # Version RC .1
+if ( PREVIEW_RELEASE )
+ set(VR " Preview")
+elseif ( NOT_FOR_RELEASE )
+ set(VR " Not for release")
+endif()
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt ReadMe.txt @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt releasenotes.txt @ONLY)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ReadMe.txt ${CMAKE_CURRENT_BINARY_DIR}/releasenotes.txt DESTINATION .)
diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake
index fefd709b..15d8a1b9 100644
--- a/cmake/printSummary.cmake
+++ b/cmake/printSummary.cmake
@@ -21,6 +21,7 @@ message( STATUS "---------------------------------------------------------------
message( STATUS "CMake Generator: ${CMAKE_GENERATOR}" )
message( STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
message( STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}")
+message( STATUS "CMAKE_CXX_STANDARD:${CMAKE_CXX_STANDARD}" )
message( STATUS " --- Compiler flags --- ")
message( STATUS "General: ${CMAKE_CXX_FLAGS}" )
printList("${COMPILER_OPTIONS}")
diff --git a/conanfile.py b/conanfile.py
index d161e655..ad76b393 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -40,6 +40,8 @@ class Exiv2Conan(ConanFile):
# libopenssl (a transitive dependency)
if os_info.is_windows:
self.requires('libcurl/7.69.1')
+ self.options['libcurl'].with_openssl = False
+ self.options['libcurl'].with_winssl = True
else:
self.requires('libcurl/7.64.1@bincrafters/stable')
diff --git a/contrib/Qt/ReadMe.txt b/contrib/Qt/ReadMe.txt
new file mode 100644
index 00000000..5795c885
--- /dev/null
+++ b/contrib/Qt/ReadMe.txt
@@ -0,0 +1,47 @@
+contrib/Qt/ReadMe.txt
+---------------------
+
+Exiv2 works well with Qt.
+
+Qt requires C++11 libraries which are the default for Exiv2 v0.28 and later.
+Exiv2 v0.27 default build (and pre-built binaries) are for C++98
+You will have to build Exiv2 v0.27 from source with C++11 for Qt.
+
+To build and run commandLineTool
+--------------------------------
+
+1) Windows Users should install MinGW/msys2 as documented in README.md
+
+2) All users should build Exiv2 with C++11 support as documented in README.md
+
+3) Generate Makefile
+ Caution: You will have to modify commandLineTool.pro to fit your environment.
+ $ cd
+ $ cd contrib/Qt
+ $ qmake commandLinePro.pro
+
+4) Build commandLineTool.cpp
+ $ make
+
+5) Run commandLineTool.exe
+ $ commandLineTool.exe
+
+UNICODE_PATH on Windows
+-----------------------
+
+Windows users may prefer to build Exiv2 to support UNICODE_PATH.
+The sample application samples/exifprint.cpp works with UNICODE_PATH.
+The cmake option -DEXIV2_ENABLE_WIN_UNICODE=ON is documented in README.md
+
+Searching for more information about Qt, MinGW and UNICODE_PATH
+---------------------------------------------------------------
+These matters are occasionally discussed on the forum. Please search to read discussions.
+
+https://github.com/Exiv2/exiv2/issues/1101#issuecomment-623141576
+http://dev.exiv2.org/boards/3/topics/2311?r=2312#message-2312
+http://dev.exiv2.org/issues/1169
+http://dev.exiv2.org/boards/3/topics/2705
+
+Robin Mills
+http://clanmills.com
+2020-05-04
diff --git a/contrib/Qt/commandLineTool.pro b/contrib/Qt/commandLineTool.pro
new file mode 100644
index 00000000..f8b9bef2
--- /dev/null
+++ b/contrib/Qt/commandLineTool.pro
@@ -0,0 +1,15 @@
+QT += core
+QT -= gui
+
+TARGET = commandLineTool
+CONFIG += console
+CONFIG -= app_bundle
+
+TEMPLATE = app
+SOURCES += main.cpp
+
+win32 {
+ INCLUDEPATH += $$quote(c:/Qt/5.14.2/mingw73_64/include)
+ INCLUDEPATH += /usr/local/include
+ LIBS += -L$$quote(c:/Qt/5.14.2/mingw73_64/include) -L/usr/local/lib -lexiv2
+}
diff --git a/contrib/Qt/main.cpp b/contrib/Qt/main.cpp
new file mode 100644
index 00000000..9e72c4fd
--- /dev/null
+++ b/contrib/Qt/main.cpp
@@ -0,0 +1,15 @@
+#include
+#include
+#include
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication a(argc, argv);
+
+ exv_grep_keys_t keys;
+ Exiv2::dumpLibraryInfo(std::cout,keys);
+
+ return 0;
+ // return a.exec();
+}
+
diff --git a/contrib/msvc2019/LICENSE b/contrib/msvc2019/LICENSE
deleted file mode 100644
index 412a0068..00000000
--- a/contrib/msvc2019/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.
diff --git a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj b/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj
deleted file mode 100644
index 989f7b68..00000000
--- a/contrib/msvc2019/solution/unitTests/unit_tests.vcxproj
+++ /dev/null
@@ -1,440 +0,0 @@
-
-
-
- x64
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {0C0707B2-8DCA-3C21-BD30-A4B4EF43B667}
- 10.0
- Win32Proj
- x64
- unit_tests
- NoUpgrade
-
-
-
- Application
- MultiByte
- v142
-
-
- Application
- MultiByte
- v142
-
-
- Application
- MultiByte
- v142
-
-
- Application
- MultiByte
- v142
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.20506.1
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\$(ProjectName)\
- true
- true
- true
- true
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\$(ProjectName)\
- false
- false
- true
- true
-
-
- $(Platform)\$(Configuration)\$(ProjectName)\
-
-
- $(Platform)\$(Configuration)\$(ProjectName)\
-
-
-
- $(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
- ProgramDatabase
- Sync
- Disabled
- true
- Disabled
- NotUsing
- MultiThreadedDebugDLL
- true
- false
- Level3
- CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)
- GTEST_LINKED_AS_SHARED_LIBRARY
-
-
- 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)/$(IntDir)
- %(Filename).h
- %(Filename).tlb
- %(Filename)_i.c
- %(Filename)_p.c
-
-
- Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib
- true
- Console
-
-
- true
-
-
-
-
- $(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
- ProgramDatabase
- Sync
- Disabled
- true
- Disabled
- NotUsing
- MultiThreadedDebugDLL
- true
- false
- Level3
- CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)
- GTEST_LINKED_AS_SHARED_LIBRARY
-
-
- 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)/$(IntDir)
- %(Filename).h
- %(Filename).tlb
- %(Filename)_i.c
- %(Filename)_p.c
-
-
- Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib
- true
- Console
-
-
- true
-
-
-
-
- $(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
- true
- MaxSpeed
- NotUsing
- MultiThreadedDLL
- true
- false
- Level3
- CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)
-
-
- GTEST_LINKED_AS_SHARED_LIBRARY
-
-
- 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)/$(IntDir)
- %(Filename).h
- %(Filename).tlb
- %(Filename)_i.c
- %(Filename)_p.c
-
-
- Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib
- false
- Console
-
-
- true
-
-
-
-
- $(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
- true
- MaxSpeed
- NotUsing
- MultiThreadedDLL
- true
- false
- Level3
- CURL_STATICLIB;LIBSSH_STATIC;ZLIB_WINAPI;WIN32;_WINDOWS;NDEBUG;exiv2lib_STATIC;PSAPI_VERSION=1;EXV_LOCALEDIR="/../share/locale";NOMINMAX;WIN32_LEAN_AND_MEAN;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)
-
-
- GTEST_LINKED_AS_SHARED_LIBRARY
-
-
- 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)/$(IntDir)
- %(Filename).h
- %(Filename).tlb
- %(Filename)_i.c
- %(Filename)_p.c
-
-
- Wldap32.lib;Crypt32.lib;psapi.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib
- false
- Console
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {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
-
-
-
-
-
-
\ No newline at end of file
diff --git a/contrib/msvc2019/README.md b/contrib/vs2019/README.md
similarity index 57%
rename from contrib/msvc2019/README.md
rename to contrib/vs2019/README.md
index 54252e69..0d482774 100644
--- a/contrib/msvc2019/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,16 +63,153 @@ 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, 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)
+ 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)
+ * 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)
- * 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.
- * `exiv2 -vV`
+ * 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
+ * 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
-
+
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 +232,14 @@ compile on Windows
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
@@ -250,41 +368,3 @@ compile on Windows
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)
- * [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]
- * [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]
- * [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 [^3].
-
-[^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
diff --git a/contrib/msvc2019/solution/exiv2.sln b/contrib/vs2019/solution/exiv2.sln
similarity index 93%
rename from contrib/msvc2019/solution/exiv2.sln
rename to contrib/vs2019/solution/exiv2.sln
index 9ea1e4d6..96b19b04 100644
--- a/contrib/msvc2019/solution/exiv2.sln
+++ b/contrib/vs2019/solution/exiv2.sln
@@ -246,46 +246,44 @@ 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}"
-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 +292,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 +302,17 @@ 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
+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
@@ -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/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 78%
rename from contrib/msvc2019/solution/samples/addmoddel.vcxproj
rename to contrib/vs2019/solution/samples/addmoddel.vcxproj
index dff0aa15..cb2ef869 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/conntest.vcxproj
rename to contrib/vs2019/solution/samples/conntest.vcxproj
index 4ea500cd..50ffeae9 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,47 @@
-
+
-
+
+ {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}
-
+ {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/msvc2019/solution/samples/conntest.vcxproj.filters b/contrib/vs2019/solution/samples/conntest.vcxproj.filters
similarity index 71%
rename from contrib/msvc2019/solution/samples/conntest.vcxproj.filters
rename to contrib/vs2019/solution/samples/conntest.vcxproj.filters
index bf345d88..c886facc 100644
--- a/contrib/msvc2019/solution/samples/conntest.vcxproj.filters
+++ b/contrib/vs2019/solution/samples/conntest.vcxproj.filters
@@ -1,9 +1,7 @@
-
- Source Files
-
+
diff --git a/contrib/msvc2019/solution/samples/convert-test.vcxproj b/contrib/vs2019/solution/samples/convert-test.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/convert-test.vcxproj
rename to contrib/vs2019/solution/samples/convert-test.vcxproj
index dc3dd06f..ccf62a97 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/easyaccess-test.vcxproj
rename to contrib/vs2019/solution/samples/easyaccess-test.vcxproj
index 61312024..ee553c9b 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/exifcomment.vcxproj
rename to contrib/vs2019/solution/samples/exifcomment.vcxproj
index 1a76deb4..4e69f889 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/exifdata-test.vcxproj
rename to contrib/vs2019/solution/samples/exifdata-test.vcxproj
index 8d29d241..5f522f9b 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/exifdata.vcxproj
rename to contrib/vs2019/solution/samples/exifdata.vcxproj
index a7c1a906..37d7ea4f 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/exifprint.vcxproj
rename to contrib/vs2019/solution/samples/exifprint.vcxproj
index 4dbbb086..d025f7be 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/exifvalue.vcxproj
rename to contrib/vs2019/solution/samples/exifvalue.vcxproj
index 219c52af..9d0963b4 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 79%
rename from contrib/msvc2019/solution/samples/exiv2json.vcxproj
rename to contrib/vs2019/solution/samples/exiv2json.vcxproj
index 49b67a11..b219e2df 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,52 @@
-
-
-
+
+
+
-
+
+ {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}
-
+ {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/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 74%
rename from contrib/msvc2019/solution/samples/geotag.vcxproj
rename to contrib/vs2019/solution/samples/geotag.vcxproj
index e6c9a74b..50f75752 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 77%
rename from contrib/msvc2019/solution/samples/getopt-test.vcxproj
rename to contrib/vs2019/solution/samples/getopt-test.vcxproj
index c29b3889..d179d2f8 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,52 @@
-
-
-
+
+
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/ini-test.vcxproj
rename to contrib/vs2019/solution/samples/ini-test.vcxproj
index d0505932..e30d586d 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/iotest.vcxproj
rename to contrib/vs2019/solution/samples/iotest.vcxproj
index 06784759..8b952544 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/msvc2019/solution/samples/iotest.vcxproj.filters b/contrib/vs2019/solution/samples/iotest.vcxproj.filters
similarity index 71%
rename from contrib/msvc2019/solution/samples/iotest.vcxproj.filters
rename to contrib/vs2019/solution/samples/iotest.vcxproj.filters
index 8cac8d0c..25fdaa79 100644
--- a/contrib/msvc2019/solution/samples/iotest.vcxproj.filters
+++ b/contrib/vs2019/solution/samples/iotest.vcxproj.filters
@@ -1,9 +1,7 @@
-
- Source Files
-
+
diff --git a/contrib/msvc2019/solution/samples/iptceasy.vcxproj b/contrib/vs2019/solution/samples/iptceasy.vcxproj
similarity index 78%
rename from contrib/msvc2019/solution/samples/iptceasy.vcxproj
rename to contrib/vs2019/solution/samples/iptceasy.vcxproj
index 6d83d733..e64b5deb 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/iptcprint.vcxproj
rename to contrib/vs2019/solution/samples/iptcprint.vcxproj
index e694c1f9..d98cfc65 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/iptctest.vcxproj
rename to contrib/vs2019/solution/samples/iptctest.vcxproj
index ea9351e0..a7b5d5e6 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/key-test.vcxproj
rename to contrib/vs2019/solution/samples/key-test.vcxproj
index 074d884c..41a7e500 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/largeiptc-test.vcxproj
rename to contrib/vs2019/solution/samples/largeiptc-test.vcxproj
index ac068ac1..2c42c4fe 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 77%
rename from contrib/msvc2019/solution/samples/metacopy.vcxproj
rename to contrib/vs2019/solution/samples/metacopy.vcxproj
index 644667b6..1b8e2b9b 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,52 @@
-
-
-
+
+
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/mmap-test.vcxproj
rename to contrib/vs2019/solution/samples/mmap-test.vcxproj
index 14020db6..53c714e3 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 79%
rename from contrib/msvc2019/solution/samples/mrwthumb.vcxproj
rename to contrib/vs2019/solution/samples/mrwthumb.vcxproj
index 0f2f4461..df4b63f0 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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 +286,4 @@
-
+
\ No newline at end of file
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 77%
rename from contrib/msvc2019/solution/samples/pathtest.vcxproj
rename to contrib/vs2019/solution/samples/pathtest.vcxproj
index 82611c30..d9511efb 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,52 @@
-
-
-
+
+
+
-
+
+ {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}
-
+ {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/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 78%
rename from contrib/msvc2019/solution/samples/prevtest.vcxproj
rename to contrib/vs2019/solution/samples/prevtest.vcxproj
index 8c6326d6..36c88d15 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {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/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 79%
rename from contrib/msvc2019/solution/samples/remotetest.vcxproj
rename to contrib/vs2019/solution/samples/remotetest.vcxproj
index c1a4ea4a..28ca4f34 100644
--- a/contrib/msvc2019/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)EnableFastChecksCompileAsCpp
@@ -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)EnableFastChecksCompileAsCpp
@@ -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)CompileAsCppSync
@@ -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)CompileAsCppSync
@@ -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,50 @@
-
+
-
+
+ {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}
-
+ {0aa428d8-e6a8-3a36-9045-621f4dde3043}
-
+