mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

android-build: Use sed -i instead of home rolled variant

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2018-05-14 21:36:29 +02:00 • committed by Dirk Hohndel
parent fa95a7c56a
commit d12e842c68
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packaging/android/build.sh
View file

@ -182,8 +182,7 @@ $QMAKE ../googlemaps.pro
# on Travis the compiler doesn't support c++1z, yet qmake adds that flag; # on Travis the compiler doesn't support c++1z, yet qmake adds that flag;
# since things compile fine with c++11, let's just hack that away # since things compile fine with c++11, let's just hack that away
# similarly, don't use -Wdata-time # similarly, don't use -Wdata-time
mv Makefile Makefile.bak sed -i.bak -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' Makefile
cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile
make -j4 make -j4
QT_PLUGINS_PATH=`$QMAKE -query QT_INSTALL_PLUGINS` QT_PLUGINS_PATH=`$QMAKE -query QT_INSTALL_PLUGINS`
GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so