From 69d8a18a48e441610429ce887953e70c4eeab91c Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 6 Jun 2020 10:03:03 +0100 Subject: [PATCH] Windows: use the patched xapian-core --- src/windows/qmkrecoll/librecoll.pro | 2 +- src/windows/qmkrecoll/libxapian.pro | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro index 0ba15dd3..2e267e53 100644 --- a/src/windows/qmkrecoll/librecoll.pro +++ b/src/windows/qmkrecoll/librecoll.pro @@ -156,7 +156,7 @@ windows { CONFIG += staticlib DEFINES += USING_STATIC_LIBICONV INCLUDEPATH += ../../windows \ - $$RECOLLDEPS/msvc/xapian-core-1.4.15/include \ + $$RECOLLDEPS/msvc/xapian-core/include \ $$RECOLLDEPS/msvc/zlib-1.2.11/ \ $$RECOLLDEPS/msvc/libxslt/libxslt-1.1.29/ \ $$RECOLLDEPS/msvc/libxml2/libxml2-2.9.4+dfsg1/include \ diff --git a/src/windows/qmkrecoll/libxapian.pro b/src/windows/qmkrecoll/libxapian.pro index df191341..c7c6acad 100644 --- a/src/windows/qmkrecoll/libxapian.pro +++ b/src/windows/qmkrecoll/libxapian.pro @@ -4,11 +4,10 @@ TARGET = libxapian TEMPLATE = lib DEFINES += __WIN32__ -DEFINES -= _UNICODE -DEFINES -= UNICODE +DEFINES += UNICODE DEFINES += HAVE_CONFIG_H -XAPIANDIR = ../../../../recolldeps/msvc/xapian-core-1.4.15/ +XAPIANDIR = ../../../../recolldeps/msvc/xapian-core/ SOURCES += \ $$XAPIANDIR/api/compactor.cc \