mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

ios: remove googlemaps unecessary multiple builds

Browse source 
googlemaps archive is a fat file already, containing
armv7, arm64 and x86-64, so no need to build it
multiple times.

Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
This commit is contained in:
Murillo Bernardes 2018-04-06 13:38:15 -03:00 committed by Dirk Hohndel
parent 07366daea5
commit 882120ba65
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packaging/ios/build.sh
View file

@ -294,18 +294,18 @@ echo next building for $ARCH
popd
fi
# build googlemaps
if [ ! -d googlemaps ] ; then
git clone git://github.com/subsurface-divelog/googlemaps
fi
mkdir -p googlemaps-build-$ARCH
pushd googlemaps-build-$ARCH
${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../googlemaps/googlemaps.pro
make
make install
popd
done
# build googlemaps
if [ ! -d googlemaps ] ; then
git clone git://github.com/subsurface-divelog/googlemaps
fi
mkdir -p googlemaps-build
pushd googlemaps-build
${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../googlemaps/googlemaps.pro CONFIG+=release
make
popd
# now combine the arm libraries into fat libraries
rm -rf install-root
cp -a install-root-arm64 install-root