mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Restored qmake call for all Android and iOS builds to fix build errors when switching branches in git.

Browse source
This commit is contained in:
Alex Zolotarev 2015-12-25 17:10:07 +03:00
parent 8674ef8246
commit f45a4623de
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/autobuild/build.sh
View file

@ -50,10 +50,10 @@ BuildQt() {
mkdir -p "$SHADOW_DIR"
cd "$SHADOW_DIR"
if [ ! -f "$SHADOW_DIR/Makefile" ]; then
echo "Launching qmake..."
"$QMAKE" CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro"
fi
echo "Launching qmake..."
# This call is needed to correctly rebuild c++ sources after switching between branches with added or removed source files.
# Otherwise we get build errors.
"$QMAKE" -r CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro"
# make clean > /dev/null || true
make -j $(GetCPUCores)
)