qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make a bunch of improvements to the droid cross scripts. 

Native versions of qfcc and pak are now built automatically, and the
android toolchain now defaults to a more sensible place. Also, the separate
pkg-config replacement is no longer necessary.
This commit is contained in:
Bill Currie 2012-11-29 10:28:46 +09:00
parent e97193faf6
commit 568b719c1b
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/cross/droid/arm-linux-androideabi-pkg-config
View File

@ -1,16 +0,0 @@
#!/bin/bash
# This file has no copyright assigned and is placed in the Public Domain.
# No warranty is given.
# When using the android cross compiler tools, the native Linux
# pkg-config executable works fine as long as the default PKG_CONFIG_LIBDIR
# is overridden.
export PKG_CONFIG_LIBDIR=$ANDROID_SYSROOT
# Also want to override the standard user defined PKG_CONFIG_PATH with
# a android specific one.
export PKG_CONFIG_PATH=$ANDROID_SYSROOT/usr/local/lib/pkgconfig
# Now just execute pkg-config with the given command line args.
pkg-config $@

15
tools/cross/droid/cross-configure.sh
View File

@ -1,8 +1,19 @@
#!/bin/sh -x
export ANDROID_NDK_ROOT=/home/bill/Downloads/android-ndk-r7
set -e
mkdir -p native android-ndk-r7
cd native
../../configure \
--disable-shared \
--without-clients \
--without-servers \
--with-tools=qfcc,pak
cd ../android-ndk-r7
export ANDROID_NDK_ROOT=/opt/android-ndk-r7
export ANDROID_SYSROOT=$ANDROID_NDK_ROOT/android-14-toolchain/sysroot
export PKG_CONFIG_LIBDIR=$ANDROID_SYSROOT
export PKG_CONFIG_PATH=$ANDROID_SYSROOT/usr/local/lib/pkgconfig
export PATH=$ANDROID_NDK_ROOT/android-14-toolchain/bin:$PATH
../configure \
../../configure \
--build=x86_64-unknown-linux-gnu \
--with-sysroot=$ANDROID_SYSROOT \
--host=arm-linux-androideabi \

12
tools/cross/droid/cross-make.sh
View File

@ -1,7 +1,15 @@
#!/bin/sh -x
export ANDROID_NDK_ROOT=/home/bill/Downloads/android-ndk-r7
set -e
if test -d native; then
cd native
make $*
cd ../android-ndk-r7
ln -fs ../native/tools/qfcc/source/qfcc .
ln -fs ../native/tools/pak/pak .
fi
export ANDROID_NDK_ROOT=/opt/android-ndk-r7
export ANDROID_SYSROOT=$ANDROID_NDK_ROOT/android-14-toolchain/sysroot
export PATH=$ANDROID_NDK_ROOT/android-14-toolchain/bin:$PATH
make PAK=pak QFCC=qfcc $*
make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $*