status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: $QTDIR should include the compiler-arch path segment

This commit is contained in:
Michael Bradley, Jr 2020-06-25 16:04:47 -05:00 committed by Iuri Matias
parent 20e0f2c625
commit dfef4374f6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -108,13 +108,13 @@ ifeq ($(QT5_PCFILEDIR),)
$(error Can't find your Qt5 installation. Please run "$(MAKE) QTDIR=/path/to/your/Qt5/installation/prefix ...") $(error Can't find your Qt5 installation. Please run "$(MAKE) QTDIR=/path/to/your/Qt5/installation/prefix ...")
else else
ifeq ($(detected_OS), Darwin) ifeq ($(detected_OS), Darwin)
QT5_PCFILEDIR := $(QTDIR)/clang_64/lib/pkgconfig QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig
QT5_LIBDIR := $(QTDIR)/clang_64/lib QT5_LIBDIR := $(QTDIR)/lib
# some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here # some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here
NIM_PARAMS += --passL:"-F$(QT5_LIBDIR)" NIM_PARAMS += --passL:"-F$(QT5_LIBDIR)"
else else
QT5_PCFILEDIR := $(QTDIR)/gcc_64/lib/pkgconfig QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig
QT5_LIBDIR := $(QTDIR)/gcc_64/lib QT5_LIBDIR := $(QTDIR)/lib
NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)" NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
endif endif
endif endif
@ -186,7 +186,7 @@ $(APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop
cp -R ui tmp/linux/dist/usr/. cp -R ui tmp/linux/dist/usr/.
echo -e $(BUILD_MSG) "AppImage" echo -e $(BUILD_MSG) "AppImage"
linuxdeployqt tmp/linux/dist/nim-status.desktop -no-translations -no-copy-copyright-files -qmldir=tmp/linux/dist/usr/ui -qmlimport=${QTDIR}/gcc_64/qml -bundle-non-qt-libs linuxdeployqt tmp/linux/dist/nim-status.desktop -no-translations -no-copy-copyright-files -qmldir=tmp/linux/dist/usr/ui -qmlimport=$(QTDIR)/qml -bundle-non-qt-libs
rm tmp/linux/dist/AppRun rm tmp/linux/dist/AppRun
cp AppRun tmp/linux/dist/. cp AppRun tmp/linux/dist/.

4
docker-linux-app-image.sh
View File

@ -19,9 +19,9 @@ export PATH="/usr/local/go/bin:${PATH}"
# $QT_PATH/$QT_VERSION/$QT_PLATFORM/bin is already prepended to $PATH # $QT_PATH/$QT_VERSION/$QT_PLATFORM/bin is already prepended to $PATH
# However $QT_VERSION is not exposed to environment so set it here # However $QT_VERSION is not exposed to environment so set it here
export QT_VERSION=$(basename $(echo "${QT_PATH}/*")) export QT_VERSION=$(basename $(echo "${QT_PATH}/*"))
export QTDIR="${QT_PATH}/${QT_VERSION}" export QTDIR="${QT_PATH}/${QT_VERSION}/${QT_PLATFORM}"
# $OPENSSL_PREFIX is provided by the docker image # $OPENSSL_PREFIX is provided by the docker image
export LIBRARY_PATH="${OPENSSL_PREFIX}/lib:${LIBRARY_PATH}" export LIBRARY_PATH="${OPENSSL_PREFIX}/lib:${LIBRARY_PATH}"
export LD_LIBRARY_PATH="${QTDIR}/${QT_PLATFORM}/lib:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${QTDIR}/lib:${LD_LIBRARY_PATH}"
make clean; git clean -dfx && rm -rf vendor/* make clean; git clean -dfx && rm -rf vendor/*
make pkg V=1 make pkg V=1

8
docs/building.md
View File

@ -36,12 +36,12 @@ brew install go
``` ```
# Linux users should use their distro's package manager, but in case they do a manual install: # Linux users should use their distro's package manager, but in case they do a manual install:
export PATH=$PATH:/path/to/Qt/5.14.2/gcc_64/bin export QTDIR="/path/to/Qt/5.14.2/gcc_64"
export QTDIR=/path/to/Qt/5.14.2/ export PATH="${QTDIR}/bin:${PATH}"
# macOS: # macOS:
export PATH=$PATH:/path/to/Qt/5.14.2/clang_64/bin export QTDIR="/path/to/Qt/5.14.2/clang_64"
export QTDIR=/path/to/Qt/5.14.2/ export PATH="${QTDIR}/bin:${PATH}"
``` ```
### 2. Clone the repo and build `nim-status-client` ### 2. Clone the repo and build `nim-status-client`