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

merged windows changes (mostly: xapian->1.4)

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-11-15 18:32:40 +01:00
commit 27dd632f15
3 changed files with 6 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,7 +35,8 @@ UNRTF=c:/unrtf
ANTIWORD=c:/recolldeps/antiword
PYXSLT=C:/recolldeps/pyxslt
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/
EPUB=C:/temp/epub-0.5.2
ZLIB=c:/temp/zlib-1.2.8
@ -81,6 +82,7 @@ FILTERS=$DESTDIR/Share/filters
# checkcopy.
chkcp()
{
echo "Copying $@"
cp $@ || fatal cp $@ failed
}

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

@ -123,11 +123,11 @@ windows {
contains(QMAKE_CC, cl){
# 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
INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.2.21/include
C:/temp/xapian-core-1.4.1/include
}
unix {

2
src/windows/recoll-setup.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Recoll"
#define MyAppVersion "1.22.0-20160414"
#define MyAppVersion "1.23.0-2477ad-20161115"
#define MyAppPublisher "Recoll.org"
#define MyAppURL "http://www.recoll.org"
#define MyAppExeName "recoll.exe"