mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 17:41:46 +00:00
Code Issues Projects Releases Wiki Activity

Added iOS sdk path

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-02 19:06:35 +01:00
parent a1996063b6
commit e39dad15e5
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/build/compile.sh
View File

@ -96,15 +96,9 @@ elif [ "$1" == "crosscompile" ]; then
elif [ "$2" == "ios" ] || [ "$2" == "ios-armv6" ]; then elif [ "$2" == "ios" ] || [ "$2" == "ios-armv6" ]; then
[ -z "$march" ] && march=armv6; [ -z "$march" ] && march=armv6;
[ -z "$mtune" ] && mtune=generic-armv6; [ -z "$mtune" ] && mtune=generic-armv6;
TOOLCHAIN_PREFIX="arm-apple-darwin10"
export CC="$TOOLCHAIN_PREFIX-llvm-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
elif [ "$2" == "ios-armv7" ]; then elif [ "$2" == "ios-armv7" ]; then
[ -z "$march" ] && march=armv7-a; [ -z "$march" ] && march=armv7-a;
[ -z "$mtune" ] && mtune=generic-armv7-a; [ -z "$mtune" ] && mtune=generic-armv7-a;
TOOLCHAIN_PREFIX="arm-apple-darwin10"
export CC="$TOOLCHAIN_PREFIX-llvm-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
else else
echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac ios ios-armv6 ios-armv7] to cross-compile" echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac ios ios-armv6 ios-armv7] to cross-compile"
exit 1 exit 1

5
src/build/jenkins.sh
View File

@ -118,7 +118,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv6 mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv6
cd $COMPILEDIR/crosscompile/ios-armv6 cd $COMPILEDIR/crosscompile/ios-armv6
$SCRIPT crosscompile ios-armv6 PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/:$PATH" $SCRIPT crosscompile ios-armv6
cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv6/ cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv6/
if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then
@ -130,8 +130,7 @@ if [ "$CROSSCOMPILE_IOS_ARMV7" = "true" ];
then then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv7 mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv7
cd $COMPILEDIR/crosscompile/ios-armv7 cd $COMPILEDIR/crosscompile/ios-armv7
PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/:$PATH" $SCRIPT crosscompile ios-armv7
$SCRIPT crosscompile ios-armv7
cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv7/ cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv7/
if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then