Windows: use xapian 1.4

This commit is contained in:
Jean-Francois Dockes 2016-11-15 16:43:05 +01:00
parent 41dfd40fba
commit 860ef3c3d2
2 changed files with 5 additions and 3 deletions

View File

@ -35,7 +35,8 @@ UNRTF=c:/unrtf
ANTIWORD=c:/recolldeps/antiword ANTIWORD=c:/recolldeps/antiword
PYXSLT=C:/recolldeps/pyxslt PYXSLT=C:/recolldeps/pyxslt
PYEXIV2=C:/recolldeps/pyexiv2 PYEXIV2=C:/recolldeps/pyexiv2
LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll #LIBXAPIAN=c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll
LIBXAPIAN=c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll
MUTAGEN=C:/temp/mutagen-1.32/ MUTAGEN=C:/temp/mutagen-1.32/
EPUB=C:/temp/epub-0.5.2 EPUB=C:/temp/epub-0.5.2
ZLIB=c:/temp/zlib-1.2.8 ZLIB=c:/temp/zlib-1.2.8
@ -81,6 +82,7 @@ FILTERS=$DESTDIR/Share/filters
# checkcopy. # checkcopy.
chkcp() chkcp()
{ {
echo "Copying $@"
cp $@ || fatal cp $@ failed cp $@ || fatal cp $@ failed
} }

View File

@ -123,11 +123,11 @@ windows {
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
} }
LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.dll \ LIBS += c:/temp/xapian-core-1.4.1/.libs/libxapian-30.dll \
c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32 c:/temp/zlib-1.2.8/zlib1.dll -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \ INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.2.21/include C:/temp/xapian-core-1.4.1/include
} }
unix { unix {