(Android) Fix ARM64 script

This commit is contained in:
twinaphex 2015-08-04 04:48:48 +02:00
parent 4216d6b853
commit 85b12115d7
2 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,17 @@
#! /usr/bin/env bash
# vim: set ts=3 sw=3 noet ft=sh : bash
SCRIPT="${0#./}"
BASE_DIR="${SCRIPT%/*}"
WORKDIR="$PWD"
if [ "$BASE_DIR" = "$SCRIPT" ]; then
BASE_DIR="$WORKDIR"
else
if [[ "$0" != /* ]]; then
# Make the path absolute
BASE_DIR="$WORKDIR/$BASE_DIR"
fi
fi
platform=android-arm64_v8a ${BASE_DIR}/libretro-build.sh $@

View File

@ -91,6 +91,34 @@ case "$platform" in
CXX11="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-g++"
;;
android-arm64_v8a)
FORMAT_ABI="arm64-v8a"
DIST_DIR="android/${FORMAT_ABI}"
FORMAT_EXT=so
FORMAT=.android_arm64_v8a
FORMAT_COMPILER_TARGET=android-arm64_v8a
FORMAT_COMPILER_TARGET_ALT=android-arm64_v8a
FORMAT_ABI_ANDROID=yes
UNAME_PLATFORM="$(uname)"
HOST_PLATFORM="linux"
case "$UNAME_PLATFORM" in
osx|*Darwin*)
HOST_PLATFORM="darwin"
;;
win|*mingw32*|*MINGW32*|*MSYS_NT*)
HOST_PLATFORM="windows"
;;
win64|*mingw64*|*MINGW64*)
HOST_PLATFORM="windows"
;;
esac
export NDK_ROOT_DIR
CC="$NDK_ROOT_DIR/toolchains/aarch64-linux-android-4.9/prebuilt/${HOST_PLATFORM}-x86_64/bin/aarch64-linux-android-gcc"
CXX="$NDK_ROOT_DIR/toolchains/aarch64-linux-android-4.9/prebuilt/${HOST_PLATFORM}-x86_64/bin/aarch64-linux-android-g++"
CXX11="$NDK_ROOT_DIR/toolchains/aarch64-linux-android-4.9/prebuilt/${HOST_PLATFORM}-x86_64/bin/aarch64-linux-android-g++"
;;
android-mips)
FORMAT_ABI="mips"
DIST_DIR="android/${FORMAT_ABI}"
@ -339,6 +367,12 @@ case "$platform" in
FORMAT_COMPILER_TARGET="${platform}"
DIST_DIR="android/armeabi-v7a"
;;
android-arm64_v8a)
platform=android-arm64_v8a
FORMAT_EXT="so"
FORMAT_COMPILER_TARGET="${platform}"
DIST_DIR="android/arm64-v8a"
;;
android-mips)
platform=android-mips
FORMAT_EXT="so"