tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Indexing works. Needs more helpers

Browse Source
This commit is contained in:
Jean-Francois Dockes
2020-04-06 09:43:58 +01:00
parent 6999284c42
commit a0b7b3a38b
8 changed files with 149 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/qmkrecoll/librecoll.pro
+5 -12
View File
@@ -15,7 +15,9 @@ DEFINES += PSAPI_VERSION=1
DEFINES += READFILE_ENABLE_MINIZ
DEFINES += READFILE_ENABLE_MD5
DEFINES += READFILE_ENABLE_ZLIB
# VC only defines __WIN32, not __WIN32__ . For some reason xapian uses __WIN32__ which it actually defines in conf_post.h if __WIN32 is set. Reason: mystery.
# VC only defines __WIN32, not __WIN32__ . For some reason xapian uses
# __WIN32__ which it actually defines in conf_post.h if __WIN32 is
# set. Reason: mystery.
DEFINES += __WIN32__
SOURCES += \
@@ -151,22 +153,13 @@ windows {
# Visual Studio
RECOLLDEPS = ../../../../recolldeps-vc
CONFIG += staticlib
LIBS += \
$$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 \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
$$RECOLLDEPS/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
DEFINES += USING_STATIC_LIBICONV
INCLUDEPATH += ../../windows \
$$RECOLLDEPS/xapian-core-1.4.15/include \
$$RECOLLDEPS/zlib-1.2.11/ \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include \
$$RECOLLDEPS/libiconv-for-windows/include
$$RECOLLDEPS/wlibiconv/include
QMAKE_CXXFLAGS_WARN_ON -= -w34100
QMAKE_CXXFLAGS += -wd4100
}
src/windows/qmkrecoll/libxapian.pro
+5 -9
View File
@@ -7,7 +7,6 @@ DEFINES += __WIN32__
DEFINES -= _UNICODE
DEFINES -= UNICODE
DEFINES += HAVE_CONFIG_H
CONFIG += staticlib
XAPIANDIR = ../../../../recolldeps-vc/xapian-core-1.4.15/
@@ -242,14 +241,11 @@ INCLUDEPATH += $$XAPIANDIR $$XAPIANDIR/include \
windows {
contains(QMAKE_CC, cl){
# Visual Studio
LIBS += \
../../../../recolldeps-vc/zlib-1.2.11/zdll.lib \
../../../../recolldeps-vc/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 \
-lshlwapi -lpsapi -lkernel32
# msvc
CONFIG += staticlib
DEFINES += USING_STATIC_LIBICONV
INCLUDEPATH += \
../../../../recolldeps-vc/zlib-1.2.11/ \
../../../../recolldeps-vc/libiconv-for-windows/include
}
../../../../recolldeps-vc/wlibiconv/include
}
}
src/windows/qmkrecoll/rclstartw.pro
+2 -3
View File
@@ -7,7 +7,7 @@ TEMPLATE = app
DEFINES += BUILDING_RECOLL
DEFINES += UNICODE
DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__
SOURCES += \
../rclstartw.cpp
@@ -24,8 +24,7 @@ windows {
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += \
-liconv -lshlwapi -lpsapi -lkernel32
LIBS += -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows
}
src/windows/qmkrecoll/recollindex.pro
+15 -14
View File
@@ -31,21 +31,22 @@ windows {
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# MSVC
RECOLLDEPS = ../../../../recolldeps-vc
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 \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
$$RECOLLDEPS/libiconv-for-windows/lib/libiconv.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
# MSVC
RECOLLDEPS = ../../../../recolldeps-vc
DEFINES += USING_STATIC_LIBICONV
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 \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibiconv \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows
}
src/windows/qmkrecoll/recollq.pro
+23 -10
View File
@@ -9,7 +9,7 @@ TEMPLATE = app
DEFINES += BUILDING_RECOLL
DEFINES += UNICODE
DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__
SOURCES += \
../../query/recollqmain.cpp
@@ -19,16 +19,29 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
../../xaposix ../../confgui ../../bincimapmime
windows {
contains(QMAKE_CC, gcc){
# MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
}
contains(QMAKE_CC, cl){
# Visual Studio
}
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
contains(QMAKE_CC, gcc){
MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter
LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# Visual Studio
RECOLLDEPS = ../../../../recolldeps-vc
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 \
-lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows
}