diff options
| author | Eugene Sandulenko | 2016-08-30 15:14:12 +0200 |
|---|---|---|
| committer | GitHub | 2016-08-30 15:14:12 +0200 |
| commit | 111dc18ef303fb299af97b5973ed1fe366b93072 (patch) | |
| tree | b71b219ed01d6829ad16631f9a89cafcab09732a /configure | |
| parent | 579cb59af52b4b891306ca8be430f772ecfb0364 (diff) | |
| parent | 61e911baf8d5f4d818abbe1926be93d5c14d758d (diff) | |
| download | scummvm-rg350-111dc18ef303fb299af97b5973ed1fe366b93072.tar.gz scummvm-rg350-111dc18ef303fb299af97b5973ed1fe366b93072.tar.bz2 scummvm-rg350-111dc18ef303fb299af97b5973ed1fe366b93072.zip | |
Merge pull request #433 from klusark/assets
ANDROID: Update the asset archive code to use AAssets
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2271,7 +2271,7 @@ case $_host_os in append_var CXXFLAGS "-mtune=xscale" append_var CXXFLAGS "-msoft-float" ABI="armeabi" - ANDROID_PLATFORM=4 + ANDROID_PLATFORM=9 ANDROID_PLATFORM_ARCH="arm" ;; android-v7a | android-arm-v7a) @@ -2280,7 +2280,7 @@ case $_host_os in append_var CXXFLAGS "-mfpu=vfp" append_var LDFLAGS "-Wl,--fix-cortex-a8" ABI="armeabi-v7a" - ANDROID_PLATFORM=4 + ANDROID_PLATFORM=9 ANDROID_PLATFORM_ARCH="arm" ;; android-mips) @@ -4859,7 +4859,7 @@ case $_backend in # -lgcc is carefully placed here - we want to catch # all toolchain symbols in *our* libraries rather # than pick up anything unhygenic from the Android libs. - LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -lGLESv1_CM" + LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -landroid -lGLESv1_CM" ;; n64) # Move some libs down here, otherwise some symbols requires by libvorbis aren't found |