mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 23:59:53 +00:00
Code Issues Projects Releases Wiki Activity

Removed -mtune

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-04 12:56:23 +01:00
parent 28af0e9f87
commit 8bc60ca36f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/build/compile.sh
View File

@ -54,14 +54,14 @@ elif [ "$1" == "mac" ]; then
echo "[INFO] Compiling for Intel MacOS" echo "[INFO] Compiling for Intel MacOS"
elif [ "$1" == "ios" ]; then elif [ "$1" == "ios" ]; then
[ -z "$march" ] && march=armv6; [ -z "$march" ] && march=armv6;
[ -z "$mtune" ] && mtune=generic-armv6; [ -z "$mtune" ] && mtune=cortex-a8;
echo "[INFO] Compiling for iOS 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; [ -z "$mtune" ] && mtune="";
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 --disable-ipv6" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6"
@ -71,7 +71,7 @@ elif [ "$1" == "crosscompile" ]; then
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; [ -z "$mtune" ] && mtune="";
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 --disable-ipv6" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --enable-static-link --disable-ipv6"
@ -128,7 +128,11 @@ 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="";
export CFLAGS="-O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS" if [ "$mtune" != "" ]; then
export CFLAGS="-O2 -march=$march -mtune=$mtune -fno-gcse $CFLAGS"
else
export CFLAGS="-O2 -march=$march -fno-gcse $CFLAGS"
fi
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