From 3fe1612bff8ef777a08c97fbcf795638f77959f5 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 16 Apr 2021 16:25:05 +0100
Subject: [PATCH] windows: small build adjustment

---
 src/windows/qmkrecoll/librecoll.pro   |  2 --
 src/windows/qmkrecoll/recollindex.pro |  8 +++--
 src/windows/qmkrecoll/trpathut.pro    | 47 +++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 src/windows/qmkrecoll/trpathut.pro

diff --git a/src/windows/qmkrecoll/librecoll.pro b/src/windows/qmkrecoll/librecoll.pro
index f144bb45..ec1a4c4d 100644
--- a/src/windows/qmkrecoll/librecoll.pro
+++ b/src/windows/qmkrecoll/librecoll.pro
@@ -30,12 +30,10 @@ SOURCES += \
 ../../common/textsplitko.cpp \
 ../../common/unacpp.cpp \
 ../../common/utf8fn.cpp \
-../../index/webqueue.cpp \
 ../../index/webqueuefetcher.cpp \
 ../../index/fetcher.cpp \
 ../../index/exefetcher.cpp \
 ../../index/fsfetcher.cpp \
-../../index/fsindexer.cpp \
 ../../index/idxdiags.cpp \
 ../../index/idxstatus.cpp \
 ../../index/indexer.cpp \
diff --git a/src/windows/qmkrecoll/recollindex.pro b/src/windows/qmkrecoll/recollindex.pro
index d22f0320..9fa47f03 100644
--- a/src/windows/qmkrecoll/recollindex.pro
+++ b/src/windows/qmkrecoll/recollindex.pro
@@ -9,12 +9,16 @@ TEMPLATE = app
 DEFINES += BUILDING_RECOLL
 
 SOURCES += \
-../../index/recollindex.cpp \
 ../../index/checkindexed.cpp \
 ../../index/checkindexed.h \
 ../../index/checkretryfailed.cpp \
+../../index/fsindexer.cpp \
+../../index/fsindexer.h \
 ../../index/rclmonprc.cpp \
-../../index/rclmonrcv.cpp 
+../../index/rclmonrcv.cpp \
+../../index/recollindex.cpp \
+../../index/webqueue.cpp \
+../../index/webqueue.h
 
 INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
             ../../unac ../../utils ../../aspell ../../rcldb ../../qtgui \
diff --git a/src/windows/qmkrecoll/trpathut.pro b/src/windows/qmkrecoll/trpathut.pro
new file mode 100644
index 00000000..4375309c
--- /dev/null
+++ b/src/windows/qmkrecoll/trpathut.pro
@@ -0,0 +1,47 @@
+
+QT       -= core gui
+
+TARGET = pathut
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+
+DEFINES += BUILDING_RECOLL
+DEFINES += UNICODE
+DEFINES += PSAPI_VERSION=1
+DEFINES += __WIN32__
+
+SOURCES += \
+../../testmains/trpathut.cpp
+
+INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
+            ../../unac ../../utils ../../aspell ../../rcldb ../../qtgui \
+            ../../xaposix ../../confgui ../../bincimapmime 
+
+windows {
+  contains(QMAKE_CC, gcc){
+     MingW
+    QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
+    LIBS += \
+      ../build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
+    -lshlwapi -lpsapi -lkernel32
+  }
+  contains(QMAKE_CC, cl){
+    # Visual Studio
+    RECOLLDEPS = ../../../../recolldeps/msvc
+    LIBS += \
+      -L../build-librecoll-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
+        -llibrecoll \
+      $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
+      $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
+      -L../build-libxapian-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
+        -llibxapian \
+      -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release/ \
+        -llibiconv \
+      $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
+      -lrpcrt4 -lws2_32 -luser32 -lshell32 \
+      -lshlwapi -lpsapi -lkernel32
+  }
+
+  INCLUDEPATH += ../../windows
+}