fix linux build

This commit is contained in:
Andrei Yankovich 2018-10-31 18:14:38 +03:00
parent 1afae46889
commit 2c433f93d8
4 changed files with 9 additions and 10 deletions

@ -1 +1 @@
Subproject commit a80e043c4db198497033930e34703fed7d17ad7c Subproject commit a2f688ebc1b1108c09d3df5d5aa4250cdfc926d4

View File

@ -9,10 +9,6 @@ SUBDIRS += QuasarAppLib/QuasarApp.pro \
SoundBand \ SoundBand \
tests tests
unix:!android:{
SUBDIRS += CQtDeployer
}
SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro
equals( ENABLE_INSTALLER, 1) { equals( ENABLE_INSTALLER, 1) {

View File

@ -2,10 +2,16 @@
CURRENTDIR=$(dirname "$(readlink -f "$0")") CURRENTDIR=$(dirname "$(readlink -f "$0")")
deploy="$CURRENTDIR/../../CQtDeployer/build/release/cqtdeployer" CQtDeployer="$CURRENTDIR/../../CQtDeployer"
deploy="$CQtDeployer/build/release/cqtdeployer.sh"
qmldir=$1 qmldir=$1
qmake=$2 qmake=$2
chmod +x $CQtDeployer/sharedBuild.sh
$CQtDeployer/sharedBuild.sh $qmake
rm -rdf "$CURRENTDIR/../packages/SoundBand/data" rm -rdf "$CURRENTDIR/../packages/SoundBand/data"
rm -rdf "$CURRENTDIR/../packages/SoundBand.Tests/data" rm -rdf "$CURRENTDIR/../packages/SoundBand.Tests/data"
@ -24,6 +30,6 @@ chmod +x $deploy
cp -Rpf "$CURRENTDIR/../../CQtDeployer/QuasarAppLib/build/release/." "$CURRENTDIR/../../CQtDeployer/build/release" cp -Rpf "$CURRENTDIR/../../CQtDeployer/QuasarAppLib/build/release/." "$CURRENTDIR/../../CQtDeployer/build/release"
$deploy -qmake $qmake clear -qmldir $qmldir -bin "$CURRENTDIR/../packages/SoundBand/data/SoundBand" $deploy -qmake "$qmake" clear -qmlDir "$qmldir" -bin "$CURRENTDIR/../packages/SoundBand/data/SoundBand"

View File

@ -19,9 +19,6 @@ QML_DIR = $$PWD/../SoundBand
WINDEPLOY = $$QT_DIR/windeployqt.exe WINDEPLOY = $$QT_DIR/windeployqt.exe
WINDEPLOY_RUN = $$PWD/deploy/deploy.bat WINDEPLOY_RUN = $$PWD/deploy/deploy.bat
LINUXDEPLOY = $$PWD/deploy/deploy.sh LINUXDEPLOY = $$PWD/deploy/deploy.sh
unix { unix {