Windows: use the patched xapian-core

2020-06-06 10:03:03 +01:00
parent f15e3f21fa
commit 69d8a18a48
2 changed files with 3 additions and 4 deletions
@@ -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 \
@@ -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 \