Windows link: use with shell32 (because of SHGetKnownFolderPath)

This commit is contained in:
Jean-Francois Dockes 2020-04-15 14:05:17 +01:00
parent 1a9e3e4694
commit 1a1faf1dd9
4 changed files with 10 additions and 9 deletions

View File

@ -5,10 +5,10 @@ TEMPLATE = app
LANGUAGE = C++
TARGET = recoll
DEFINES += USING_WEBKIT
QT += webkit webkitwidgets
#QT += widgets webenginewidgets
#DEFINES += USING_WEBENGINE
#DEFINES += USING_WEBKIT
#QT += webkit webkitwidgets
QT += widgets webenginewidgets
DEFINES += USING_WEBENGINE
QT += xml printsupport
@ -132,7 +132,7 @@ windows {
-llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
-lshell32 -lshlwapi -lpsapi -lkernel32
}
}

View File

@ -100,6 +100,7 @@ SOURCES += \
../../utils/cpuconf.cpp \
../../utils/dlib.cpp \
../../utils/ecrontab.cpp \
../../utils/listmem.cpp \
../../utils/utf8iter.cpp \
../../utils/zlibut.cpp \
../../utils/zlibut.h \
@ -142,7 +143,7 @@ windows {
$$RECOLLDEPS/mingw/libxml2/libxml2-2.9.4+dfsg1/win32/bin.mingw/libxml2.a \
$$RECOLLDEPS/mingw/xapian-core-1.4.11/.libs/libxapian-30.dll \
$$RECOLLDEPS/mingw/zlib-1.2.8/zlib1.dll \
-liconv -lshlwapi -lpsapi -lkernel32
-lshell32 -liconv -lshlwapi -lpsapi -lkernel32
INCLUDEPATH += ../../windows \
$$RECOLLDEPS/mingw/xapian-core-1.4.11/include \
$$RECOLLDEPS/mingw/libxslt/libxslt-1.1.29/ \

View File

@ -44,7 +44,7 @@ windows {
-llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_1_MSVC2017_32bit-Release/release \
-llibiconv \
-llibiconv -lShell32 \
-lrpcrt4 -lws2_32 -luser32 \
-lshlwapi -lpsapi -lkernel32
}

View File

@ -24,7 +24,7 @@ windows {
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
-lShell32 -lshlwapi -lpsapi -lkernel32
}
contains(QMAKE_CC, cl){
# Visual Studio
@ -39,7 +39,7 @@ windows {
-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 \
-lrpcrt4 -lws2_32 -luser32 -lshell32 \
-lshlwapi -lpsapi -lkernel32
}