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

windows/qtcreator msvc adjustements

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-04-04 14:00:39 +01:00
parent 1b6ea4042d
commit a468406e17
7 changed files with 341 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/autoconfig-win.h
View File

@ -119,10 +119,10 @@ overriden in the c++ code by ifdefs _WIN32 anyway */
#define PACKAGE_NAME "Recoll" #define PACKAGE_NAME "Recoll"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "Recoll 1.26.6" #define PACKAGE_STRING "Recoll 1.27.0"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.26.6" #define PACKAGE_VERSION "1.27.0"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "recoll" #define PACKAGE_TARNAME "recoll"

6
src/index/checkretryfailed.cpp
View File

@ -36,7 +36,7 @@ bool checkRetryFailed(RclConfig *conf, bool record)
#ifdef _WIN32 #ifdef _WIN32
// Under Windows we only retry if the recollindex program is newer // Under Windows we only retry if the recollindex program is newer
// than the index // than the index
struct stat st; struct PathStat st;
string path(thisprog); string path(thisprog);
if (path_suffix(path).empty()) { if (path_suffix(path).empty()) {
path = path + ".exe"; path = path + ".exe";
@ -46,14 +46,14 @@ bool checkRetryFailed(RclConfig *conf, bool record)
thisprog << endl); thisprog << endl);
return false; return false;
} }
time_t exetime = st.st_mtime; time_t exetime = st.pst_mtime;
if (path_fileprops(conf->getDbDir(), &st) != 0) { if (path_fileprops(conf->getDbDir(), &st) != 0) {
// Maybe it just does not exist. // Maybe it just does not exist.
LOGDEB("checkRetryFailed: can't stat the index directory: " << LOGDEB("checkRetryFailed: can't stat the index directory: " <<
conf->getDbDir() << endl); conf->getDbDir() << endl);
return false; return false;
} }
time_t dbtime = st.st_mtime; time_t dbtime = st.pst_mtime;
return exetime > dbtime; return exetime > dbtime;
#else #else
string cmd; string cmd;

33
src/qtgui/recoll-win.pro
View File

@ -5,17 +5,19 @@ TEMPLATE = app
LANGUAGE = C++ LANGUAGE = C++
TARGET = recoll TARGET = recoll
QT += webkit #QT += webkit
#DEFINES += USING_WEBKIT
QT += widgets webenginewidgets
DEFINES += USING_WEBENGINE
QT += xml printsupport
DEFINES += BUILDING_RECOLL DEFINES += BUILDING_RECOLL
DEFINES += USING_WEBKIT
DEFINES -= UNICODE DEFINES -= UNICODE
DEFINES -= _UNICODE DEFINES -= _UNICODE
DEFINES += _MBCS DEFINES += _MBCS
DEFINES += PSAPI_VERSION=1 DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__
QT += xml
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
HEADERS += \ HEADERS += \
advsearch_w.h \ advsearch_w.h \
@ -112,11 +114,24 @@ windows {
contains(QMAKE_CC, gcc){ contains(QMAKE_CC, gcc){
# MingW # MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter 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
} }
contains(QMAKE_CC, cl){
# Visual Studio contains(QMAKE_CC, cl){
} # MSVC
LIBS += C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll RECOLLDEPS = ../../../recolldeps-vc
LIBS += \
-L../windows/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../windows/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
}
} }
TRANSLATIONS = \ TRANSLATIONS = \

4
src/utils/execmd.h
View File

@ -22,6 +22,10 @@
#include <stack> #include <stack>
#include <sys/types.h> #include <sys/types.h>
#ifdef _MSC_VER
typedef int pid_t;
#endif
/** /**
* Callback function object to advise of new data arrival, or just periodic * Callback function object to advise of new data arrival, or just periodic
* heartbeat if cnt is 0. * heartbeat if cnt is 0.

58
src/windows/qmkrecoll/librecoll.pro
View File

@ -18,10 +18,6 @@ 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__ DEFINES += __WIN32__
# This is necessary to avoid an undefined impl__xmlFree.
# See comment in libxml/xmlexports.h
DEFINES += LIBXML_STATIC
SOURCES += \ SOURCES += \
../../aspell/rclaspell.cpp \ ../../aspell/rclaspell.cpp \
../../bincimapmime/convert.cc \ ../../bincimapmime/convert.cc \
@ -35,6 +31,7 @@ SOURCES += \
../../common/rclinit.cpp \ ../../common/rclinit.cpp \
../../common/syngroups.cpp \ ../../common/syngroups.cpp \
../../common/textsplit.cpp \ ../../common/textsplit.cpp \
../../common/textsplitko.cpp \
../../common/unacpp.cpp \ ../../common/unacpp.cpp \
../../common/utf8fn.cpp \ ../../common/utf8fn.cpp \
../../index/webqueue.cpp \ ../../index/webqueue.cpp \
@ -95,6 +92,7 @@ SOURCES += \
../../utils/cancelcheck.cpp \ ../../utils/cancelcheck.cpp \
../../utils/chrono.cpp \ ../../utils/chrono.cpp \
../../utils/circache.cpp \ ../../utils/circache.cpp \
../../utils/cmdtalk.cpp \
../../utils/conftree.cpp \ ../../utils/conftree.cpp \
../../utils/copyfile.cpp \ ../../utils/copyfile.cpp \
../../utils/cpuconf.cpp \ ../../utils/cpuconf.cpp \
@ -132,31 +130,45 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
windows { windows {
contains(QMAKE_CC, gcc){ contains(QMAKE_CC, gcc){
# MingW # MingW
# This is necessary to avoid an undefined impl__xmlFree.
# See comment in libxml/xmlexports.h
DEFINES += LIBXML_STATIC
RECOLLDEPS = C:/recolldeps
QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
LIBS += C:/recolldeps/libxslt/libxslt-1.1.29/win32/bin.mingw/libxslt.a \ LIBS += \
C:/recolldeps/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.mingw/libxslt.a \
c:/recolldeps/xapian-core-1.4.11/.libs/libxapian-30.dll \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \
c:/recolldeps/zlib-1.2.8/zlib1.dll \ $$RECOLLDEPS/xapian-core-1.4.11/.libs/libxapian-30.dll \
$$RECOLLDEPS/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32 -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \ INCLUDEPATH += ../../windows \
C:/recolldeps/xapian-core-1.4.15/include \ $$RECOLLDEPS/xapian-core-1.4.15/include \
C:/recolldeps/libxslt/libxslt-1.1.29/ \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
C:/recolldeps/libxml2/libxml2-2.9.4+dfsg1/include $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include
} }
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
LIBS += C:/users/bill/documents/recolldeps-vc/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \ RECOLLDEPS = ../../../../recolldeps-vc
C:/users/bill/documents/recolldeps-vc/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \ CONFIG += staticlib
c:/users/bill/documents/recolldeps-vc/xapian-core-1.4.15/.libs/xapian.lib \ LIBS += \
c:/users/bill/documents/recolldeps-vc/zlib-1.2.11/zlib.lib \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
c:/users/bill/documents/recolldeps-vc/libiconv-for-windows/lib/libiconv.lib \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-lshlwapi -lpsapi -lkernel32 -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
INCLUDEPATH += ../../windows \ INCLUDEPATH += ../../windows \
C:/users/bill/documents/recolldeps-vc/xapian-core-1.4.15/include \ $$RECOLLDEPS/xapian-core-1.4.15/include \
C:/users/bill/documents/recolldeps-vc/zlib-1.2.11/ \ $$RECOLLDEPS/zlib-1.2.11/ \
C:/users/bill/documents/recolldeps-vc/libxslt/libxslt-1.1.29/ \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/ \
C:/users/bill/documents/recolldeps-vc/libxml2/libxml2-2.9.4+dfsg1/include \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/include \
C:/users/bill/documents/recolldeps-vc/libiconv-for-windows/include $$RECOLLDEPS/libiconv-for-windows/include
QMAKE_CXXFLAGS_WARN_ON -= -w34100
QMAKE_CXXFLAGS += -wd4100
} }
} }

255
src/windows/qmkrecoll/libxapian.pro Normal file
View File

@ -0,0 +1,255 @@
QT -= core gui
TARGET = libxapian
TEMPLATE = lib
DEFINES += __WIN32__
DEFINES -= _UNICODE
DEFINES -= UNICODE
DEFINES += HAVE_CONFIG_H
CONFIG += staticlib
XAPIANDIR = ../../../../recolldeps-vc/xapian-core-1.4.15/
SOURCES += \
$$XAPIANDIR/api/compactor.cc \
$$XAPIANDIR/api/constinfo.cc \
$$XAPIANDIR/api/decvalwtsource.cc \
$$XAPIANDIR/api/documentvaluelist.cc \
$$XAPIANDIR/api/editdistance.cc \
$$XAPIANDIR/api/emptypostlist.cc \
$$XAPIANDIR/api/error.cc \
$$XAPIANDIR/api/errorhandler.cc \
$$XAPIANDIR/api/expanddecider.cc \
$$XAPIANDIR/api/keymaker.cc \
$$XAPIANDIR/api/leafpostlist.cc \
$$XAPIANDIR/api/matchspy.cc \
$$XAPIANDIR/api/omdatabase.cc \
$$XAPIANDIR/api/omdocument.cc \
$$XAPIANDIR/api/omenquire.cc \
$$XAPIANDIR/api/positioniterator.cc \
$$XAPIANDIR/api/postingiterator.cc \
$$XAPIANDIR/api/postingsource.cc \
$$XAPIANDIR/api/postlist.cc \
$$XAPIANDIR/api/query.cc \
$$XAPIANDIR/api/queryinternal.cc \
$$XAPIANDIR/api/registry.cc \
$$XAPIANDIR/api/smallvector.cc \
$$XAPIANDIR/api/sortable-serialise.cc \
$$XAPIANDIR/api/termiterator.cc \
$$XAPIANDIR/api/termlist.cc \
$$XAPIANDIR/api/valueiterator.cc \
$$XAPIANDIR/api/valuerangeproc.cc \
$$XAPIANDIR/api/valuesetmatchdecider.cc \
$$XAPIANDIR/api/vectortermlist.cc \
$$XAPIANDIR/api/replication.cc \
$$XAPIANDIR/backends/alltermslist.cc \
$$XAPIANDIR/backends/dbcheck.cc \
$$XAPIANDIR/backends/database.cc \
$$XAPIANDIR/backends/databasehelpers.cc \
$$XAPIANDIR/backends/databasereplicator.cc \
$$XAPIANDIR/backends/dbfactory.cc \
$$XAPIANDIR/backends/slowvaluelist.cc \
$$XAPIANDIR/backends/uuids.cc \
$$XAPIANDIR/backends/valuelist.cc \
$$XAPIANDIR/backends/dbfactory_remote.cc \
$$XAPIANDIR/backends/contiguousalldocspostlist.cc \
$$XAPIANDIR/backends/flint_lock.cc \
$$XAPIANDIR/backends/chert/chert_alldocsmodifiedpostlist.cc \
$$XAPIANDIR/backends/chert/chert_alldocspostlist.cc \
$$XAPIANDIR/backends/chert/chert_alltermslist.cc \
$$XAPIANDIR/backends/chert/chert_btreebase.cc \
$$XAPIANDIR/backends/chert/chert_check.cc \
$$XAPIANDIR/backends/chert/chert_compact.cc \
$$XAPIANDIR/backends/chert/chert_cursor.cc \
$$XAPIANDIR/backends/chert/chert_database.cc \
$$XAPIANDIR/backends/chert/chert_dbcheck.cc \
$$XAPIANDIR/backends/chert/chert_dbstats.cc \
$$XAPIANDIR/backends/chert/chert_document.cc \
$$XAPIANDIR/backends/chert/chert_metadata.cc \
$$XAPIANDIR/backends/chert/chert_modifiedpostlist.cc \
$$XAPIANDIR/backends/chert/chert_positionlist.cc \
$$XAPIANDIR/backends/chert/chert_postlist.cc \
$$XAPIANDIR/backends/chert/chert_record.cc \
$$XAPIANDIR/backends/chert/chert_spelling.cc \
$$XAPIANDIR/backends/chert/chert_spellingwordslist.cc \
$$XAPIANDIR/backends/chert/chert_synonym.cc \
$$XAPIANDIR/backends/chert/chert_table.cc \
$$XAPIANDIR/backends/chert/chert_termlist.cc \
$$XAPIANDIR/backends/chert/chert_termlisttable.cc \
$$XAPIANDIR/backends/chert/chert_valuelist.cc \
$$XAPIANDIR/backends/chert/chert_values.cc \
$$XAPIANDIR/backends/chert/chert_version.cc \
$$XAPIANDIR/backends/chert/chert_databasereplicator.cc \
$$XAPIANDIR/backends/glass/glass_alldocspostlist.cc \
$$XAPIANDIR/backends/glass/glass_alltermslist.cc \
$$XAPIANDIR/backends/glass/glass_changes.cc \
$$XAPIANDIR/backends/glass/glass_check.cc \
$$XAPIANDIR/backends/glass/glass_compact.cc \
$$XAPIANDIR/backends/glass/glass_cursor.cc \
$$XAPIANDIR/backends/glass/glass_database.cc \
$$XAPIANDIR/backends/glass/glass_dbcheck.cc \
$$XAPIANDIR/backends/glass/glass_document.cc \
$$XAPIANDIR/backends/glass/glass_freelist.cc \
$$XAPIANDIR/backends/glass/glass_inverter.cc \
$$XAPIANDIR/backends/glass/glass_metadata.cc \
$$XAPIANDIR/backends/glass/glass_positionlist.cc \
$$XAPIANDIR/backends/glass/glass_postlist.cc \
$$XAPIANDIR/backends/glass/glass_spelling.cc \
$$XAPIANDIR/backends/glass/glass_spellingwordslist.cc \
$$XAPIANDIR/backends/glass/glass_synonym.cc \
$$XAPIANDIR/backends/glass/glass_table.cc \
$$XAPIANDIR/backends/glass/glass_termlist.cc \
$$XAPIANDIR/backends/glass/glass_termlisttable.cc \
$$XAPIANDIR/backends/glass/glass_valuelist.cc \
$$XAPIANDIR/backends/glass/glass_values.cc \
$$XAPIANDIR/backends/glass/glass_version.cc \
$$XAPIANDIR/backends/glass/glass_databasereplicator.cc \
$$XAPIANDIR/backends/inmemory/inmemory_alltermslist.cc \
$$XAPIANDIR/backends/inmemory/inmemory_database.cc \
$$XAPIANDIR/backends/inmemory/inmemory_document.cc \
$$XAPIANDIR/backends/inmemory/inmemory_positionlist.cc \
$$XAPIANDIR/backends/multi/multi_alltermslist.cc \
$$XAPIANDIR/backends/multi/multi_postlist.cc \
$$XAPIANDIR/backends/multi/multi_termlist.cc \
$$XAPIANDIR/backends/multi/multi_valuelist.cc \
$$XAPIANDIR/backends/remote/remote-document.cc \
$$XAPIANDIR/backends/remote/net_postlist.cc \
$$XAPIANDIR/backends/remote/net_termlist.cc \
$$XAPIANDIR/backends/remote/remote-database.cc \
$$XAPIANDIR/common/bitstream.cc \
$$XAPIANDIR/common/closefrom.cc \
$$XAPIANDIR/common/debuglog.cc \
$$XAPIANDIR/common/errno_to_string.cc \
$$XAPIANDIR/common/fileutils.cc \
$$XAPIANDIR/common/io_utils.cc \
$$XAPIANDIR/common/keyword.cc \
$$XAPIANDIR/common/msvc_dirent.cc \
$$XAPIANDIR/common/omassert.cc \
$$XAPIANDIR/common/posixy_wrapper.cc \
$$XAPIANDIR/common/replicate_utils.cc \
$$XAPIANDIR/common/safe.cc \
$$XAPIANDIR/common/serialise-double.cc \
$$XAPIANDIR/common/socket_utils.cc \
$$XAPIANDIR/common/str.cc \
$$XAPIANDIR/common/compression_stream.cc \
$$XAPIANDIR/expand/bo1eweight.cc \
$$XAPIANDIR/expand/esetinternal.cc \
$$XAPIANDIR/expand/expandweight.cc \
$$XAPIANDIR/expand/ortermlist.cc \
$$XAPIANDIR/expand/tradeweight.cc \
$$XAPIANDIR/geospatial/geoencode.cc \
$$XAPIANDIR/geospatial/latlongcoord.cc \
$$XAPIANDIR/geospatial/latlong_distance_keymaker.cc \
$$XAPIANDIR/geospatial/latlong_metrics.cc \
$$XAPIANDIR/geospatial/latlong_posting_source.cc \
$$XAPIANDIR/languages/arabic.cc \
$$XAPIANDIR/languages/armenian.cc \
$$XAPIANDIR/languages/basque.cc \
$$XAPIANDIR/languages/catalan.cc \
$$XAPIANDIR/languages/danish.cc \
$$XAPIANDIR/languages/dutch.cc \
$$XAPIANDIR/languages/english.cc \
$$XAPIANDIR/languages/earlyenglish.cc \
$$XAPIANDIR/languages/finnish.cc \
$$XAPIANDIR/languages/french.cc \
$$XAPIANDIR/languages/german2.cc \
$$XAPIANDIR/languages/german.cc \
$$XAPIANDIR/languages/hungarian.cc \
$$XAPIANDIR/languages/indonesian.cc \
$$XAPIANDIR/languages/irish.cc \
$$XAPIANDIR/languages/italian.cc \
$$XAPIANDIR/languages/kraaij_pohlmann.cc \
$$XAPIANDIR/languages/lithuanian.cc \
$$XAPIANDIR/languages/lovins.cc \
$$XAPIANDIR/languages/nepali.cc \
$$XAPIANDIR/languages/norwegian.cc \
$$XAPIANDIR/languages/porter.cc \
$$XAPIANDIR/languages/portuguese.cc \
$$XAPIANDIR/languages/romanian.cc \
$$XAPIANDIR/languages/russian.cc \
$$XAPIANDIR/languages/spanish.cc \
$$XAPIANDIR/languages/swedish.cc \
$$XAPIANDIR/languages/tamil.cc \
$$XAPIANDIR/languages/turkish.cc \
$$XAPIANDIR/languages/stem.cc \
$$XAPIANDIR/languages/steminternal.cc \
$$XAPIANDIR/matcher/remotesubmatch.cc \
$$XAPIANDIR/matcher/andmaybepostlist.cc \
$$XAPIANDIR/matcher/andnotpostlist.cc \
$$XAPIANDIR/matcher/branchpostlist.cc \
$$XAPIANDIR/matcher/collapser.cc \
$$XAPIANDIR/matcher/exactphrasepostlist.cc \
$$XAPIANDIR/matcher/externalpostlist.cc \
$$XAPIANDIR/matcher/localsubmatch.cc \
$$XAPIANDIR/matcher/maxpostlist.cc \
$$XAPIANDIR/matcher/mergepostlist.cc \
$$XAPIANDIR/matcher/msetcmp.cc \
$$XAPIANDIR/matcher/msetpostlist.cc \
$$XAPIANDIR/matcher/multiandpostlist.cc \
$$XAPIANDIR/matcher/multimatch.cc \
$$XAPIANDIR/matcher/multixorpostlist.cc \
$$XAPIANDIR/matcher/nearpostlist.cc \
$$XAPIANDIR/matcher/orpositionlist.cc \
$$XAPIANDIR/matcher/orpospostlist.cc \
$$XAPIANDIR/matcher/orpostlist.cc \
$$XAPIANDIR/matcher/phrasepostlist.cc \
$$XAPIANDIR/matcher/selectpostlist.cc \
$$XAPIANDIR/matcher/synonympostlist.cc \
$$XAPIANDIR/matcher/valuegepostlist.cc \
$$XAPIANDIR/matcher/valuerangepostlist.cc \
$$XAPIANDIR/matcher/valuestreamdocument.cc \
$$XAPIANDIR/net/length.cc \
$$XAPIANDIR/net/serialise.cc \
$$XAPIANDIR/net/progclient.cc \
$$XAPIANDIR/net/remoteconnection.cc \
$$XAPIANDIR/net/remoteserver.cc \
$$XAPIANDIR/net/remotetcpclient.cc \
$$XAPIANDIR/net/remotetcpserver.cc \
$$XAPIANDIR/net/replicatetcpclient.cc \
$$XAPIANDIR/net/replicatetcpserver.cc \
$$XAPIANDIR/net/serialise-error.cc \
$$XAPIANDIR/net/tcpclient.cc \
$$XAPIANDIR/net/tcpserver.cc \
$$XAPIANDIR/queryparser/cjk-tokenizer.cc \
$$XAPIANDIR/queryparser/queryparser.cc \
$$XAPIANDIR/queryparser/queryparser_internal.cc \
$$XAPIANDIR/queryparser/termgenerator.cc \
$$XAPIANDIR/queryparser/termgenerator_internal.cc \
$$XAPIANDIR/unicode/description_append.cc \
$$XAPIANDIR/unicode/unicode-data.cc \
$$XAPIANDIR/unicode/utf8itor.cc \
$$XAPIANDIR/weight/bb2weight.cc \
$$XAPIANDIR/weight/bm25plusweight.cc \
$$XAPIANDIR/weight/bm25weight.cc \
$$XAPIANDIR/weight/boolweight.cc \
$$XAPIANDIR/weight/coordweight.cc \
$$XAPIANDIR/weight/dlhweight.cc \
$$XAPIANDIR/weight/dphweight.cc \
$$XAPIANDIR/weight/ifb2weight.cc \
$$XAPIANDIR/weight/ineb2weight.cc \
$$XAPIANDIR/weight/inl2weight.cc \
$$XAPIANDIR/weight/lmweight.cc \
$$XAPIANDIR/weight/pl2plusweight.cc \
$$XAPIANDIR/weight/pl2weight.cc \
$$XAPIANDIR/weight/tfidfweight.cc \
$$XAPIANDIR/weight/tradweight.cc \
$$XAPIANDIR/weight/weight.cc \
$$XAPIANDIR/weight/weightinternal.cc
INCLUDEPATH += $$XAPIANDIR $$XAPIANDIR/include \
$$XAPIANDIR/common
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
INCLUDEPATH += \
../../../../recolldeps-vc/zlib-1.2.11/ \
../../../../recolldeps-vc/libiconv-for-windows/include
}
}

22
src/windows/qmkrecoll/recollindex.pro
View File

@ -10,6 +10,7 @@ DEFINES += BUILDING_RECOLL
DEFINES += UNICODE DEFINES += UNICODE
DEFINES += PSAPI_VERSION=1 DEFINES += PSAPI_VERSION=1
DEFINES += RCL_MONITOR DEFINES += RCL_MONITOR
DEFINES += __WIN32__
SOURCES += \ SOURCES += \
../../index/recollindex.cpp \ ../../index/recollindex.cpp \
@ -25,13 +26,26 @@ windows {
contains(QMAKE_CC, gcc){ contains(QMAKE_CC, gcc){
# MingW # MingW
QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter QMAKE_CXXFLAGS += -std=c++11 -pthread -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){ contains(QMAKE_CC, cl){
# Visual Studio # MSVC
} RECOLLDEPS = ../../../../recolldeps-vc
LIBS += \ LIBS += \
C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \ -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 -lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows INCLUDEPATH += ../../windows
} }