diff options
| author | Antoniou Athanasios | 2019-04-28 16:08:37 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-04-28 16:08:37 +0300 |
| commit | 793aa4033dafb9f399c362d5befc0389239ea18f (patch) | |
| tree | c677e944ace72650a7af9a4d365908bec9eca7dd /dists/androidsdl/build.sh | |
| parent | b3d5bb34ae52063abb23175de9bd4d6d525145e1 (diff) | |
| download | scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.gz scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.tar.bz2 scummvm-rg350-793aa4033dafb9f399c362d5befc0389239ea18f.zip | |
ANDROIDSDL: Fix build with NDK r15c
This also disables cloud support
Also, several corrections and additions in how_to_build instructions
Tested in a clean installation of lubuntu 16.04.6 LTS
Diffstat (limited to 'dists/androidsdl/build.sh')
| -rwxr-xr-x | dists/androidsdl/build.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dists/androidsdl/build.sh b/dists/androidsdl/build.sh index ec65e2a216..f801d8c857 100755 --- a/dists/androidsdl/build.sh +++ b/dists/androidsdl/build.sh @@ -9,7 +9,10 @@ if [ \! -d ../../../androidsdl ] ; then cd androidsdl git submodule update --init project/jni/iconv/src git checkout d378ee692f2e380a0ab0635c1df2eb6941b5bf58 - cd ../scummvm/dists/androidsdl + cd project/jni/iconv/src +# checkout a specific version of iconv that allows building with the specific version (d378ee692f2e380a0ab0635c1df2eb6941b5bf58) of androidsdl + git checkout 07bead221ed4fa61cc8d880db3d9a5e704866097 + cd ../../../../../scummvm/dists/androidsdl fi if [ \! -d scummvm/scummvm ] ; then |