LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-20 12:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

LuaJIT build script also builds for x86 and added the binary. First step to optional support of x86 android devices

Browse Source
This commit is contained in:
Martin Felis
2016-01-20 22:53:06 +01:00
parent 5e410bca8e
commit 7aaeb1485e
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/LuaJIT-2.1/android/armeabi-v7a/libluajit.a
BIN
View File
Binary file not shown.
jni/LuaJIT-2.1/android/armeabi/libluajit.a
BIN
View File
Binary file not shown.
jni/LuaJIT-2.1/android/x86/libluajit.a
BIN
View File
Binary file not shown.
jni/LuaJIT-2.1/buildandroid.sh
+31 -10
View File
@@ -8,7 +8,8 @@ host_os=`uname -s | tr "[:upper:]" "[:lower:]"`
host_arch=`uname -m` host_arch=`uname -m`
if [ -f android/armeabi/libluajit.a ] && if [ -f android/armeabi/libluajit.a ] &&
[ -f android/armeabi-v7a/libluajit.a ]; then [ -f android/armeabi-v7a/libluajit.a ] &&
[ -f android/x86/libluajit.a ]; then
echo "LuaJIT Already built" echo "LuaJIT Already built"
exit 0 exit 0
fi fi
@@ -27,20 +28,37 @@ if [[ x$NDK = "x" ]]; then
fi fi
NDKABI=9 NDKABI=9
NDKVER=$NDK/toolchains/arm-linux-androideabi-4.8
NDKP=$NDKVER/prebuilt/${host_os}-${host_arch}/bin/arm-linux-androideabi- # Since OSX still has bash 3, we don't have associative arrays, fake them instead
NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm" armeabi=0
CFLAGS="" armeabiv7a=1
x86=2
NDKVER[$armeabi]="$NDK/toolchains/arm-linux-androideabi-4.8"
NDKP[$armeabi]="${NDKVER[$armeabi]}/prebuilt/${host_os}-${host_arch}/bin/arm-linux-androideabi-"
NDKF[$armeabi]="--sysroot \"$NDK/platforms/android-$NDKABI/arch-arm\""
CFLAGS[$armeabi]=""
NDKVER[$armeabiv7a]="${NDKVER[$armeabi]}"
NDKP[$armeabiv7a]="${NDKP[$armeabi]}"
NDKF[$armeabiv7a]="${NDKF[$armeabi]}"
CFLAGS[$armeabiv7a]="${CFLAGS[$armeabi]}"
NDKVER[$x86]="$NDK/toolchains/x86-4.8"
NDKP[$x86]="${NDKVER[$x86]}/prebuilt/${host_os}-${host_arch}/bin/i686-linux-android-"
NDKF[$x86]="--sysroot \"$NDK/platforms/android-$NDKABI/arch-x86\""
CFLAGS[$x86]="-DLUAJIT_NO_LOG2"
buildLuaJIT() buildLuaJIT()
{ {
arch="$1" archkey="$1"
ndkarch="$2" arch="$2"
ndkarch="$3"
DESTDIR=../android/$arch DESTDIR=../android/$arch
mkdir -p $DESTDIR 2>/dev/null mkdir -p $DESTDIR 2>/dev/null
rm "$DESTDIR"/*.a 2>/dev/null rm "$DESTDIR"/*.a 2>/dev/null
make clean make clean
make HOST_CC="gcc -m32" CROSS=$NDKP TARGET_SYS=Linux TARGET_FLAGS="$NDKF $ndkarch" TARGET_CFLAGS="$CFLAGS" libluajit.a make HOST_CC="gcc -m32" CROSS="${NDKP[$archkey]}" TARGET_SYS=Linux TARGET_FLAGS="${NDKF[$archkey]} $ndkarch" TARGET_CFLAGS="${CFLAGS[$archkey]}" libluajit.a
if [ -f libluajit.a ]; then if [ -f libluajit.a ]; then
mv libluajit.a $DESTDIR/libluajit.a mv libluajit.a $DESTDIR/libluajit.a
@@ -50,9 +68,12 @@ buildLuaJIT()
cd src cd src
# Android/ARM, armeabi (ARMv5TE soft-float), Android 2.2+ (Froyo) # Android/ARM, armeabi (ARMv5TE soft-float), Android 2.2+ (Froyo)
buildLuaJIT armeabi buildLuaJIT $armeabi armeabi
# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.0+ (ICS) # Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.0+ (ICS)
buildLuaJIT armeabi-v7a "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -Wl,--fix-cortex-a8" buildLuaJIT $armeabiv7a armeabi-v7a "-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -Wl,--fix-cortex-a8"
# Android/x86
buildLuaJIT $x86 x86
make clean make clean