From 6a4a33811d453eb9f3f2fe65ca159199e47e9be2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 4 Aug 2015 04:55:24 +0200 Subject: [PATCH] Add libretro-build-android-x86.sh --- libretro-build-android-x86.sh | 17 +++++++++++++++++ libretro-config.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100755 libretro-build-android-x86.sh diff --git a/libretro-build-android-x86.sh b/libretro-build-android-x86.sh new file mode 100755 index 00000000..6eb0ba2c --- /dev/null +++ b/libretro-build-android-x86.sh @@ -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-x86 ${BASE_DIR}/libretro-build.sh $@ diff --git a/libretro-config.sh b/libretro-config.sh index 22821cf9..dfccfdd6 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -35,6 +35,34 @@ case "$platform" in CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK" ;; + android-x86) + FORMAT_ABI="x86" + DIST_DIR="android/${FORMAT_ABI}" + FORMAT_EXT=so + FORMAT=.${FORMAT_ABI} + FORMAT_COMPILER_TARGET=android-${FORMAT_ABI} + FORMAT_COMPILER_TARGET_ALT=android-${FORMAT_ABI} + 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/x86-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/i686-linux-android-gcc" + CXX="$NDK_ROOT_DIR/toolchains/x86-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/i686-linux-android-g++" + CXX11="$NDK_ROOT_DIR/toolchains/x86-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/i686-linux-android-g++" + ;; + android-armeabi) FORMAT_ABI="armeabi" DIST_DIR="android/${FORMAT_ABI}" @@ -355,6 +383,12 @@ case "$platform" in FORMAT_COMPILER_TARGET="ngc" DIST_DIR="ngc" ;; + android-x86) + platform=android-x86 + FORMAT_EXT="so" + FORMAT_COMPILER_TARGET="${platform}" + DIST_DIR="android/x86" + ;; android-armeabi) platform=android-armeabi FORMAT_EXT="so"