tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-02-08 18:06:16 +01:00
commit c5ca129db9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/windows/mkinstdir.sh
View File

@ -35,8 +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 #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

9
src/windows/qmkrecoll/librecoll.pro
View File

@ -123,11 +123,16 @@ windows {
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
} }
LIBS += c:/temp/xapian-core-1.4.1/.libs/libxapian-30.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
# INCLUDEPATH += ../../windows \
# C:/temp/xapian-core-1.4.1/include
LIBS += c:/temp/xapian-core-1.2.21/.libs/libxapian-22.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.4.1/include C:/temp/xapian-core-1.2.21/include
} }
unix { unix {