Commit c5ca129d authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

Merge

parents 116a35c7 ffef6927
......@@ -35,8 +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.4.1/.libs/libxapian-30.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
......
......@@ -123,11 +123,16 @@ windows {
contains(QMAKE_CC, cl){
# 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
INCLUDEPATH += ../../windows \
C:/temp/xapian-core-1.4.1/include
C:/temp/xapian-core-1.2.21/include
}
unix {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment