From 398799b0221c6d861e92ae13986940040350baa6 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 9 Apr 2020 10:24:40 +0100 Subject: [PATCH] qtcreator windows .pro files: fix some paths --- src/windows/qmkrecoll/libxapian.pro | 6 +++--- src/windows/qmkrecoll/recollq.pro | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/windows/qmkrecoll/libxapian.pro b/src/windows/qmkrecoll/libxapian.pro index dabd0c0b..df191341 100644 --- a/src/windows/qmkrecoll/libxapian.pro +++ b/src/windows/qmkrecoll/libxapian.pro @@ -8,7 +8,7 @@ DEFINES -= _UNICODE DEFINES -= UNICODE DEFINES += HAVE_CONFIG_H -XAPIANDIR = ../../../../recolldeps-vc/xapian-core-1.4.15/ +XAPIANDIR = ../../../../recolldeps/msvc/xapian-core-1.4.15/ SOURCES += \ $$XAPIANDIR/api/compactor.cc \ @@ -245,7 +245,7 @@ windows { CONFIG += staticlib DEFINES += USING_STATIC_LIBICONV INCLUDEPATH += \ - ../../../../recolldeps-vc/zlib-1.2.11/ \ - ../../../../recolldeps-vc/wlibiconv/include + ../../../../recolldeps/msvc/zlib-1.2.11/ \ + ../../../../recolldeps/msvc/wlibiconv/include } } diff --git a/src/windows/qmkrecoll/recollq.pro b/src/windows/qmkrecoll/recollq.pro index 258219bd..27b145a5 100644 --- a/src/windows/qmkrecoll/recollq.pro +++ b/src/windows/qmkrecoll/recollq.pro @@ -28,7 +28,7 @@ windows { } contains(QMAKE_CC, cl){ # Visual Studio - RECOLLDEPS = ../../../../recolldeps-vc + RECOLLDEPS = ../../../../recolldeps/msvc LIBS += \ -L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \ -llibrecoll \