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

Windows qmake files: add deps on librecoll for the exes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-01-15 09:44:09 +00:00
parent 87f86ac268
commit b51f9efcf7
3 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,40 +117,39 @@ INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb ../qtgui ../xaposix \ ../utils ../aspell ../rcldb ../qtgui ../xaposix \
confgui widgets confgui widgets
windows { windows {
DEFINES += PSAPI_VERSION=1 DEFINES += PSAPI_VERSION=1
DEFINES += __WIN32__ DEFINES += __WIN32__
DEFINES += UNICODE DEFINES += UNICODE
RC_FILE = recoll.rc RC_FILE = recoll.rc
HEADERS += \ HEADERS += \
winschedtool.h winschedtool.h
SOURCES += \ SOURCES += \
winschedtool.cpp winschedtool.cpp
FORMS += \ FORMS += \
winschedtool.ui winschedtool.ui
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 LIBS += \
} C:/recoll/src/windows/build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll
}
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# MSVC # MSVC
RECOLLDEPS = ../../../recolldeps/msvc RECOLLDEPS = ../../../recolldeps/msvc
DEFINES += USING_STATIC_LIBICONV DEFINES += USING_STATIC_LIBICONV
PRE_TARGETDEPS = \
../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/librecoll.lib
LIBS += \ LIBS += \
-L../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ -L../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibrecoll \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../windows/build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ -L../windows/build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibxapian \
-llibxapian \ -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibiconv \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \
-llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \ $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 \ -lrpcrt4 -lws2_32 -luser32 -lshell32 -lshlwapi -lpsapi -lkernel32
-lshell32 -lshlwapi -lpsapi -lkernel32
} }
} }

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

@ -35,25 +35,23 @@ windows {
LIBS += \ LIBS += \
../build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \ ../build-librecoll-Desktop_Qt_5_8_0_MinGW_32bit-Release/release/librecoll.dll \
-lshlwapi -lpsapi -lkernel32 -lshlwapi -lpsapi -lkernel32
} }
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# MSVC # MSVC
RECOLLDEPS = ../../../../recolldeps/msvc RECOLLDEPS = ../../../../recolldeps/msvc
DEFINES += USING_STATIC_LIBICONV DEFINES += USING_STATIC_LIBICONV
LIBS += \ PRE_TARGETDEPS = \
-L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ ../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/librecoll.lib
-llibrecoll \ LIBS += \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \ -L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibrecoll \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
-L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-llibxapian \ -L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibxapian \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \ $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibiconv \
-llibiconv -lShell32 \ -lShell32 -lrpcrt4 -lws2_32 -luser32 -lshlwapi -lpsapi -lkernel32
-lrpcrt4 -lws2_32 -luser32 \ }
-lshlwapi -lpsapi -lkernel32
}
INCLUDEPATH += ../../windows INCLUDEPATH += ../../windows
SOURCES += ../../windows/getopt.cc SOURCES += ../../windows/getopt.cc

14
src/windows/qmkrecoll/recollq.pro
View File

@ -29,18 +29,16 @@ windows {
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio
RECOLLDEPS = ../../../../recolldeps/msvc RECOLLDEPS = ../../../../recolldeps/msvc
PRE_TARGETDEPS = \
../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/librecoll.lib
LIBS += \ LIBS += \
-L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ -L../build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibrecoll \
-llibrecoll \
$$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \ $$RECOLLDEPS/libxml2/libxml2-2.9.4+dfsg1/win32/bin.msvc/libxml2.lib \
$$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \ $$RECOLLDEPS/libxslt/libxslt-1.1.29/win32/bin.msvc/libxslt.lib \
-L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release \ -L../build-libxapian-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibxapian \
-llibxapian \ -L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/ -llibiconv \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/ \
-llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \ $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 -lshell32 \ -lrpcrt4 -lws2_32 -luser32 -lshell32 -lshlwapi -lpsapi -lkernel32
-lshlwapi -lpsapi -lkernel32
} }
INCLUDEPATH += ../../windows INCLUDEPATH += ../../windows