pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-04-07 14:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update make

Browse Source
This commit is contained in:
K0R0L
2019-06-17 17:18:59 +03:00
parent 0b47e78f78
commit 3ffda3d806
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
make
View File

@ -77,7 +77,7 @@ case "$OO_OS" in
*) exit ;;
esac
if [[ "$OS_DEPLOY_64" == "mac_64" ]]
if [[ "${OS_DEPLOY_64}" == "mac_64" ]]
then
IS_NEED_32=false
fi
@ -94,8 +94,8 @@ fi
if [[ "$IS_NEED_64" == true ]]
then
export QT_DEPLOY="${OO_QT_DIR}/${OO_COMPILER_X64}/bin"
export OS_DEPLOY=$OS_DEPLOY_64
"$QT_DEPLOY/qmake" -nocache build.pro "CONFIG+=$OO_CONFIG $OO_MODULE"
export OS_DEPLOY="${OS_DEPLOY_64}"
"${QT_DEPLOY}/qmake" -nocache build.pro "CONFIG+=$OO_CONFIG $OO_MODULE"
if [ "$OO_CLEAN" == "1" ]
then
make clean -f "makefiles/build.makefile_${OS_DEPLOY_64}"
@ -104,11 +104,11 @@ then
rm ".qmake.stash"
fi
if [[ "$IS_NEED_32" == false ]]
if [[ "$IS_NEED_32" == true ]]
then
export QT_DEPLOY=${OO_QT_DIR}/${OO_COMPILER}/bin
export OS_DEPLOY=linux_32
"$QT_DEPLOY/qmake" -nocache build.pro "CONFIG+=$OO_CONFIG $OO_MODULE"
"${QT_DEPLOY}/qmake" -nocache build.pro "CONFIG+=$OO_CONFIG $OO_MODULE"
if [ "$OO_CLEAN" == "1" ]
then
make clean -f "makefiles/build.makefile_linux_32"