Add ndk-g++

This commit is contained in:
pancake 2018-04-11 00:22:46 +02:00
parent c6b34180a4
commit 9e39a91bd0
3 changed files with 17 additions and 4 deletions

View File

@ -124,9 +124,13 @@ if [ "${BUILD}" != 0 ]; then
SHELL=sh
cp -f "${ROOT}/ndk-gcc" "${NDK}"
chmod +x "${NDK}/ndk-gcc"
cp -f "${ROOT}/ndk-g++" "${NDK}"
chmod +x "${NDK}/ndk-g++"
CC=ndk-gcc
CXX=ndk-g++
PS1="[r2-android-${NDK_ARCH}]> "
export CC
export CXX
export PS1
export AR
export RANLIB

2
sys/ndk-g++ Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
NDKCXX=1 ndk-gcc $*

View File

@ -9,6 +9,12 @@ if [ -z "${NDK}" ]; then
fi
fi
if [ "${NDKCXX}" = 1 ]; then
CCN=g++
else
CCN=gcc
fi
if [ -n "${NDK_ARCH}" ]; then
ARCH=${NDK_ARCH}
else
@ -44,7 +50,7 @@ arm)
mips)
ANDROID_SDK_VERSION=${ANDROID_KITKAT}
NDKPFX=mipsel-linux-android
${NDKPFX}-gcc 2>/dev/null
${NDKPFX}-${CCN} 2>/dev/null
if [ $? -gt 1 ]; then
NDKPFX=mipsel-linux-android
fi
@ -52,7 +58,7 @@ mips)
mips64)
ANDROID_SDK_VERSION=${ANDROID_LOLIPOP}
NDKPFX=mips64el-linux-android
${NDKPFX}-gcc 2>/dev/null
${NDKPFX}-${CCN} 2>/dev/null
if [ $? -gt 1 ]; then
NDKPFX=mips64el-linux-android
fi
@ -60,7 +66,7 @@ mips64)
x86)
ANDROID_SDK_VERSION=${ANDROID_KITKAT} #x86
NDKPFX=i686-android-linux
${NDKPFX}-gcc 2>/dev/null
${NDKPFX}-${CCN} 2>/dev/null
if [ $? -gt 1 ]; then
NDKPFX=i686-linux-android
fi
@ -108,11 +114,12 @@ LDFLAGS="${LDFLAGS} --sysroot=${PLATFORM_ROOT}"
#LDFLAGS="${LDFLAGS} ${PLATFORM_PATH}/lib/crtbegin_dynamic.o"
#fi
CC="${NDKPFX}-gcc"
CXX="${NDKPFX}-g++"
AR="${NDKPFX}-ar"
EXT_SO=so
export PATH="${NDK_BINS}:$PATH"
export EXT_SO AR CC CFLAGS LDFLAGS PATH
export EXT_SO AR CC CXX CFLAGS LDFLAGS PATH
#shellcheck disable=SC2048
#shellcheck disable=SC2086