diff --git a/.pydevproject b/.pydevproject index e8ccd18..a5bf161 100644 --- a/.pydevproject +++ b/.pydevproject @@ -1,7 +1,7 @@ -Default -python 2.7 +Ren'Py +python interpreter /${PROJECT_DIR_NAME}/buildlib diff --git a/native/build.sh b/native/build.sh index b46c024..60241b9 100755 --- a/native/build.sh +++ b/native/build.sh @@ -3,9 +3,8 @@ export NATIVE="$(dirname $(readlink -f $0))" export ANDROID="$(dirname $NATIVE)" export SOURCE="$NATIVE/source" -export NDK="$NATIVE/android-ndk" -export SDK="$NATIVE/../android-sdk" -export ANDROID_PLATFORM=android-9 +export SDK="${ANDROID_HOME:-/home/tom/Android/Sdk}" +export NDK="${ANDROID_NDK:-$SDK/ndk-bundle}" export PYGAME_SDL2_ROOT="${PYGAME_SDL2_ROOT:-/home/tom/ab/pygame_sdl2}" export RENPY_ROOT="${RENPY_ROOT:-/home/tom/ab/renpy}" @@ -20,6 +19,7 @@ build_host() { # Build for host. export PLATFORM=host + export CC="ccache gcc" export LD="ccache gcc" @@ -37,6 +37,8 @@ build_platform () { run_once openssl unpack run_once openssl build + exit + # Use the toolchain to build python. run_once python unpack run_once python apply_patches @@ -66,10 +68,12 @@ build_platform () { build_arm () { - export PLATFORM=armeabi + export ANDROID_PLATFORM=android-15 + export PLATFORM=armeabi-v7a export NDK_ARCH=arm export FFMPEG_ARCH=arm export GCC_ARCH=arm-linux-androideabi + export OPENSSL_ARCH="android -march=armv7-a" build_platform } @@ -77,10 +81,12 @@ build_arm () { build_x86 () { + export ANDROID_PLATFORM=android-15 export PLATFORM=x86 export NDK_ARCH=x86 export FFMPEG_ARCH=x86 export GCC_ARCH=i686-linux-android + export OPENSSL_ARCH="android-x86" build_platform } @@ -89,6 +95,7 @@ build_ () { run finish clean build_host + build_x86 build_arm diff --git a/native/scripts/common.sh b/native/scripts/common.sh index 294d54d..a8923cc 100644 --- a/native/scripts/common.sh +++ b/native/scripts/common.sh @@ -57,6 +57,7 @@ activate_toolchain () { export CXX="ccache $GCC_ARCH-g++" export LD="ccache $GCC_ARCH-gcc" export LDXX="ccache $GCC_ARCH-g++" + export RANLIB="$GCC_ARCH-ranlib" export CFLAGS="-DANDROID" export LDFLAGS="" diff --git a/native/scripts/openssl.sh b/native/scripts/openssl.sh index 48f1993..7fa79c0 100644 --- a/native/scripts/openssl.sh +++ b/native/scripts/openssl.sh @@ -12,9 +12,14 @@ build () { pushd "openssl-$version" - ./Configure --prefix="$INSTALLDIR" -fPIC no-asm no-shared no-comp no-hw no-engine android + export CROSS_SYSROOT="$INSTALLDIR/toolchain/sysroot" - make depend + ./Configure --prefix="$INSTALLDIR" \ + no-asm no-shared no-comp no-hw no-engine \ + $OPENSSL_ARCH -fPIC \ + -D__ANDROID_API__=${ANDROID_PLATFORM#android-} + + make depend CFLAGS="$CFLAGS" make make install