Merge branch 'master' of github.com:libretro/libretro-super

This commit is contained in:
fr500 2015-08-03 20:55:22 -04:00
commit 961c83e3ea
2 changed files with 52 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-armeabi_v7a ${BASE_DIR}/libretro-build.sh $@

View File

@ -35,6 +35,35 @@ case "$platform" in
CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK" CXX11="clang++ -std=c++11 -stdlib=libc++ -arch armv7 -marm -miphoneos-version-min=5.0 -isysroot $IOSSDK"
;; ;;
android-armeabi_v7a)
DIST_DIR="android/armeabi-v7a"
FORMAT_EXT=so
FORMAT=.armeabi-v7a
FORMAT_COMPILER_TARGET=android-armeabi_v7a
FORMAT_COMPILER_TARGET_ALT=android-armeabi_v7a
UNAME_PLATFORM="$(uname)"
HOST_PLATFORM="linux"
echo $UNAME_PLATFORM
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
echo ${NDK_ROOT_DIR}
CC="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-gcc"
CXX="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-g++"
CXX11="$NDK_ROOT_DIR/toolchains/arm-linux-androideabi-4.8/prebuilt/${HOST_PLATFORM}-x86_64/bin/arm-linux-androideabi-g++"
;;
qnx) qnx)
DIST_DIR="qnx" DIST_DIR="qnx"
FORMAT_EXT=so FORMAT_EXT=so
@ -215,6 +244,12 @@ case "$platform" in
FORMAT_COMPILER_TARGET="ngc" FORMAT_COMPILER_TARGET="ngc"
DIST_DIR="ngc" DIST_DIR="ngc"
;; ;;
android-armeabi_v7a)
platform=android-armeabi_v7a
FORMAT_EXT="so"
FORMAT_COMPILER_TARGET="android-armeabi_v7a"
DIST_DIR="android/armeabi-v7a"
;;
theos_ios*) theos_ios*)
platform=theos_ios platform=theos_ios
FORMAT_EXT="dylib" FORMAT_EXT="dylib"