mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 03:35:33 +00:00
Code Issues Projects Releases Wiki Activity

Updated compile.sh Android parameters

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-04 12:40:16 +01:00
parent 3bf812b3b3
commit 28af0e9f87
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/build/compile.sh
View File

@ -52,25 +52,29 @@ elif [ "$1" == "mac" ]; then
[ -z "$mtune" ] && mtune=generic; [ -z "$mtune" ] && mtune=generic;
[ -z "$CFLAGS" ] && CFLAGS="-fomit-frame-pointer"; [ -z "$CFLAGS" ] && CFLAGS="-fomit-frame-pointer";
echo "[INFO] Compiling for Intel MacOS" echo "[INFO] Compiling for Intel MacOS"
elif [ "$1" == "ios" ]; then
[ -z "$march" ] && march=armv6;
[ -z "$mtune" ] && mtune=generic-armv6;
echo "[INFO] Compiling for iOS ARMv6"
elif [ "$1" == "crosscompile" ]; then elif [ "$1" == "crosscompile" ]; then
HAVE_MYSQLI="--without-mysqli" HAVE_MYSQLI="--without-mysqli"
if [ "$2" == "android" ] || [ "$2" == "android-armv6" ]; then if [ "$2" == "android" ] || [ "$2" == "android-armv6" ]; then
COMPILE_FOR_ANDROID=yes COMPILE_FOR_ANDROID=yes
[ -z "$march" ] && march=armv6; [ -z "$march" ] && march=armv6;
[ -z "$mtune" ] && mtune=generic-armv6; [ -z "$mtune" ] && mtune=generic;
TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi" TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi"
export CC="$TOOLCHAIN_PREFIX-gcc" export CC="$TOOLCHAIN_PREFIX-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6"
CFLAGS="-uclibc --static $CFLAGS"; CFLAGS="-uclibc --static $CFLAGS";
LDFLAGS="--static" LDFLAGS="--static"
echo "[INFO] Cross-compiling for Android ARMv6" echo "[INFO] Cross-compiling for Android ARMv6"
elif [ "$2" == "android-armv7" ]; then elif [ "$2" == "android-armv7" ]; then
COMPILE_FOR_ANDROID=yes COMPILE_FOR_ANDROID=yes
[ -z "$march" ] && march=armv7; [ -z "$march" ] && march=armv7;
[ -z "$mtune" ] && mtune=generic-armv7; [ -z "$mtune" ] && mtune=generic;
TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi" TOOLCHAIN_PREFIX="arm-unknown-linux-uclibcgnueabi"
export CC="$TOOLCHAIN_PREFIX-gcc" export CC="$TOOLCHAIN_PREFIX-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6"
CFLAGS="-uclibc --static $CFLAGS"; CFLAGS="-uclibc --static $CFLAGS";
LDFLAGS="--static" LDFLAGS="--static"
echo "[INFO] Cross-compiling for Android ARMv7" echo "[INFO] Cross-compiling for Android ARMv7"
@ -124,24 +128,7 @@ type $CC >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"$CC\
[ -z "$LDFLAGS" ] && LDFLAGS=""; [ -z "$LDFLAGS" ] && LDFLAGS="";
[ -z "$CONFIGURE_FLAGS" ] && CONFIGURE_FLAGS=""; [ -z "$CONFIGURE_FLAGS" ] && CONFIGURE_FLAGS="";
if [ "$1" != "crosscompile" ]; then
$CC -O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS -Q --help=target >> "$DIR/install.log" 2>&1
if [ $? -ne 0 ]; then
$CC -O2 -fno-gcse $CFLAGS -Q --help=target >> "$DIR/install.log" 2>&1
if [ $? -ne 0 ]; then
export CFLAGS="-O2 -fno-gcse "
else
export CFLAGS="-O2 -fno-gcse $CFLAGS"
fi
else
export CFLAGS="-O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS" export CFLAGS="-O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS"
fi
else
export CFLAGS="-O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS"
fi
export CFLAGS="$CFLAGS"
export LDFLAGS="$LDFLAGS" export LDFLAGS="$LDFLAGS"
rm -r -f install_data/ >> "$DIR/install.log" 2>&1 rm -r -f install_data/ >> "$DIR/install.log" 2>&1