#1041 Work in progress. More corrections to r4486. Updated dist/ReadMe.txt to deal with MinGW

This commit is contained in:
Robin Mills
2016-09-13 07:16:33 +00:00
parent 07ba4ed250
commit a63b315420
2 changed files with 41 additions and 13 deletions
+12 -12
View File
@@ -113,28 +113,28 @@ testBuild()
# run exiv2 to check the build is sane
bin/.libs/exiv2 --verbose --version
# install and copy the build in the dist
# install and copy the build to the dist
make install
# run exiv2 to check the build is sane
# copy bin lib include to dist
for d in bin lib include; do
mkdir -p "$dist/$d"
mkdir -p "$dist/$d"
cp -R /usr/local/$d/*expat* /usr/local/$d/*exiv* /usr/local/$d/z* /usr/local/$d/libz* /usr/local/$d/libdl* "$dist/$d"
done
# fix up minor stuff
rm -rf "$dist/lib/libexiv2-13.dll"
cp bin/*.exe "$dist/bin/"
mkdir -p "$dist/lib/pkgconfig"
cp -R /usr/local/lib/pkgconfig/* "$dist/lib/pkgconfig"
mkdir -p "$dist/share/man/man1/"
cp -R /usr/local/share/man/man1/*exiv2* "$dist/share/man/man1/"
mkdir -p "$dist/samples"
rm -rf "$dist/lib/libexiv2-13.dll"
mkdir -p "$dist/lib/pkgconfig"
cp -R /usr/local/lib/pkgconfig/* "$dist/lib/pkgconfig"
mkdir -p "$dist/share/man/man1/"
cp -R /usr/local/share/man/man1/*exiv2* "$dist/share/man/man1/"
mkdir -p "$dist/samples"
export "PATH=$dist/bin/:$PATH"
# run the test suite
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
make samples
make tests
make samples
cp bin/*.exe "$dist/bin/"
make tests
else
# recursively invoke MinGW/bash with appropriate tool chain
export RECURSIVE=1
+29 -1
View File
@@ -87,6 +87,34 @@ exiv2=0.25.0
xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/
$
platform = mingw
-----------------
dist/mingw/bin/exiv2.exe exiv2.exe and sample applications
.../bin/libexiv2-14.dll shared library
/lib/exiv2.dll.a libraries for exiv2/expat/zlib
/include/exiv2/ include files
/share/ man pages
dist/samples/exifprint.cpp sample code
dist/logs/ log files
To run exiv2.exe:
$ cd dist
$ PATH="$PWD/mingw/bin:$PATH"
$ mingw/bin/exiv2
To compile and link your own code:
Caution: This is a 32 bit build intended for use with MinGW32/Qt 5.6
An error such as "incorrect architecture" is a symptom of using mingw64
$ cd dist
$ cp -R mingw/* /usr/local
$ g++ --std=c++98 -L/usr/local/lib -lexiv2.dll samples/exifprint.cpp -o exifprint
$ ./exifprint --version
exiv2=0.25.0
...
xmlns=xmpidq:http://ns.adobe.com/xmp/Identifier/qual/1.0/
$
platform = msvc
---------------
@@ -119,4 +147,4 @@ c:\temp\dist>
Robin Mills
robin@clanmills.com
2015-12-13
2016-09-13