fix build system

This commit is contained in:
Andrei Yankovich 2019-04-07 00:01:51 +03:00
parent 8511183b5d
commit 56649a4128
7 changed files with 21 additions and 20 deletions

@ -1 +1 @@
Subproject commit f16b511e6c9a415ee457dc931d8b2566c263294a
Subproject commit a984e8d6d0387d32cbbc39483a68aa8cc64f0302

2
pe

@ -1 +1 @@
Subproject commit 2674c083646482e844159a38c02b6a3767d83672
Subproject commit 7138bb218a05c81d825728ba8a0a6f6a56c4fdbc

2
qtBase

@ -1 +1 @@
Subproject commit 856fb1ab44722f5165fb6b5dec0bd748006acd10
Subproject commit 08de243eaa007597c2bfbc97d3d14e2f821ac4be

View File

@ -11,6 +11,7 @@ declare -a QTLIBS
BASE_DIR=$(dirname "$(readlink -f "$0")")
QTLIBS=( libQt5Sql.so libQt5Xml.so libQt5Core.so libQt5Test.so libQt5Network.so libQt5Concurrent.so)
QT_DIR=sharedQt
RELEASE_DIR=$BASE_DIR/distro
CQDEPLOYER_DIR=$BASE_DIR/CQtDeployer/build/release
@ -33,31 +34,31 @@ then
else
echo "use qmake from build!"
QMAKE=$BASE_DIR/sharedQt/bin/qmake
QMAKE=$BASE_DIR/$QT_DIR/bin/qmake
cd $BASE_DIR/qtBase
for var in "${QTLIBS[@]}"
do
if [ -e "$BASE_DIR/sharedQt/lib/$var" ]
then
echo "$var - ok"
else
echo "$var - not exits!. rebuild qt ..."
if [ -e "$BASE_DIR/$QT_DIR/lib/$var" ]
then
echo "$var - ok"
else
echo "$var - not exits!. rebuild qt ..."
rm -rdf $BASE_DIR/sharedQt
git clean -xdf
git checkout v5.12.2
./configure -confirm-license -prefix $BASE_DIR/sharedQt -release -shared -no-opengl -no-openssl -opensource -nomake tests -nomake examples -qt-pcre -no-gui -no-widgets -no-dbus -no-accessibility
make install -j$(nproc)
break
fi
rm -rdf $BASE_DIR/$QT_DIR
git clean -xdf
git checkout v5.11.3
./configure -confirm-license -prefix $BASE_DIR/$QT_DIR -release -shared -no-opengl -no-openssl -opensource -nomake tests -nomake examples -qt-pcre -no-gui -no-widgets -no-dbus -no-accessibility
make install -j$(nproc)
break
fi
done
cd ..
export PATH=$PATH:$BASE_DIR/sharedQt
export PATH=$PATH:$BASE_DIR/$QT_DIR
fi
$QMAKE $BASE_DIR/CQtDeployer.pro -r

View File

@ -54,7 +54,7 @@ do
echo "$var - not exits!. rebuild qt ..."
rm -rdf $BASE_DIR/$QT_DIR
git clean -xdf
git checkout v5.12.2
git checkout v5.11.3
./configure -confirm-license -prefix $BASE_DIR/$QT_DIR -release -static -optimize-size -qt-pcre -qt-zlib -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility
make install -j$(nproc)
break

View File

@ -51,7 +51,7 @@ do
echo "$var - not exits!. rebuild qt ..."
rm -rdf $BASE_DIR/$QT_DIR
git clean -xdf
git checkout v5.11.3
git checkout v5.12.3
./configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32- -confirm-license -prefix $BASE_DIR/$QT_DIR -release -optimize-size -static -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility
make install -j$(nproc)
break

View File

@ -51,7 +51,7 @@ do
echo "$var - not exits!. rebuild qt ..."
rm -rdf $BASE_DIR/$QT_DIR
git clean -xdf
git checkout v5.11.3
git checkout v5.12.2
./configure -xplatform win32-g++ -device-option CROSS_COMPILE=x86_64-w64-mingw32- -confirm-license -prefix $BASE_DIR/$QT_DIR -release -optimize-size -static -no-opengl -no-openssl -opensource -nomake tests -nomake examples -no-gui -no-widgets -no-dbus -no-accessibility
make install -j$(nproc)
break