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

recoll-win.pro: use variable for build location

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-05-17 00:06:24 -07:00
parent e34ccb69b8
commit f4a5fe38c6
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packaging/mac/make-recoll-dmg.sh
View File

@ -13,10 +13,9 @@ usage()
# Adjustable things # Adjustable things
top=~/Recoll top=~/Recoll
# The possibly bogus version we have in paths (may be harcoded in the .pro) # The possibly bogus version we have in paths (may be harcoded in the .pro)
# qtpathversion=Desktop_Qt_5_15_2 # qcbuildloc=Desktop_Qt_5_15_2_clang_64bit
qtpathversion=Qt_6_2_4 qcbuildloc=Qt_6_2_4_for_macOS
# path_clang=clang_64bit
path_clang=for_macOS
# qtversion=5.15.2 # qtversion=5.15.2
qtversion=6.2.4 qtversion=6.2.4
@ -24,9 +23,9 @@ qtversion=6.2.4
deploy=~/Qt/${qtversion}/macos/bin/macdeployqt deploy=~/Qt/${qtversion}/macos/bin/macdeployqt
toprecoll=$top/recoll/src toprecoll=$top/recoll/src
appdir=$toprecoll/build-recoll-win-${qtpathversion}_${path_clang}-Release/recoll.app appdir=$toprecoll/build-recoll-win-${qcbuildloc}-Release/recoll.app
rclindexdir=$toprecoll/windows/build-recollindex-${qtpathversion}_${path_clang}-Release rclindexdir=$toprecoll/windows/build-recollindex-${qcbuildloc}-Release
rclqdir=$toprecoll/windows/build-recollq-${qtpathversion}_${path_clang}-Release rclqdir=$toprecoll/windows/build-recollq-${qcbuildloc}-Release
bindir=$appdir/Contents/MacOS bindir=$appdir/Contents/MacOS
datadir=$appdir/Contents/Resources datadir=$appdir/Contents/Resources

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

@ -124,6 +124,7 @@ windows {
DEFINES += __WIN32__ DEFINES += __WIN32__
DEFINES += UNICODE DEFINES += UNICODE
RC_FILE = recoll.rc RC_FILE = recoll.rc
QCBUILDLOC = Desktop_Qt_5_14_2_MSVC2017_32bit
HEADERS += \ HEADERS += \
winschedtool.h winschedtool.h
@ -144,13 +145,13 @@ windows {
RECOLLDEPS = ../../../recolldeps/msvc RECOLLDEPS = ../../../recolldeps/msvc
DEFINES += USING_STATIC_LIBICONV DEFINES += USING_STATIC_LIBICONV
PRE_TARGETDEPS = \ PRE_TARGETDEPS = \
../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release/librecoll.lib ../windows/build-librecoll-$$QCBUILDLOC-Release/release/librecoll.lib
LIBS += \ LIBS += \
-L../windows/build-librecoll-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibrecoll \ -L../windows/build-librecoll-$$QCBUILDLOC-Release/release -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 -llibxapian \ -L../windows/build-libxapian-$$QCBUILDLOC-Release/release -llibxapian \
-L$$RECOLLDEPS/build-libiconv-Desktop_Qt_5_14_2_MSVC2017_32bit-Release/release -llibiconv \ -L$$RECOLLDEPS/build-libiconv-$$QCBUILDLOC-Release/release -llibiconv \
$$RECOLLDEPS/zlib-1.2.11/zdll.lib \ $$RECOLLDEPS/zlib-1.2.11/zdll.lib \
-lrpcrt4 -lws2_32 -luser32 -lshell32 -lshlwapi -lpsapi -lkernel32 -lrpcrt4 -lws2_32 -luser32 -lshell32 -lshlwapi -lpsapi -lkernel32
} }
@ -159,6 +160,7 @@ windows {
mac { mac {
QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64
QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
QCBUILDLOC=Qt_6_2_4_for_macOS
HEADERS += \ HEADERS += \
crontool.h \ crontool.h \
@ -177,8 +179,8 @@ mac {
rtitool.ui rtitool.ui
LIBS += \ LIBS += \
../windows/build-librecoll-Qt_6_2_4_for_macOS-Release/liblibrecoll.a \ ../windows/build-librecoll-$$QCBUILDLOC-Release/liblibrecoll.a \
../windows/build-libxapian-Qt_6_2_4_for_macOS-Release/liblibxapian.a \ ../windows/build-libxapian-$$QCBUILDLOC-Release/liblibxapian.a \
-lxslt -lxml2 -liconv -lz -lxslt -lxml2 -liconv -lz
ICON = images/recoll.icns ICON = images/recoll.icns