miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for CrystaX NDK r5b

Browse Source
This commit is contained in:
pelya
2011-03-22 12:09:29 +02:00
parent 21bf45e9ef
commit b8be901b25
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@@ -25,7 +25,7 @@ fi
cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build -j4 V=1 && \ cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build -j4 V=1 && \
{ grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \ { grep "CustomBuildScript=y" ../AndroidAppSettings.cfg > /dev/null && \
[ -`which ndk-build | grep /android-ndk-r5b/` != - ] && \ [ -`which ndk-build | grep '/android-ndk-r5b/\|/android-ndk-r5-crystax/'` != - ] && \
echo Stripping libapplication.so by hand \ echo Stripping libapplication.so by hand \
rm obj/local/armeabi/libapplication.so && \ rm obj/local/armeabi/libapplication.so && \
cp jni/application/src/libapplication.so obj/local/armeabi && \ cp jni/application/src/libapplication.so obj/local/armeabi && \

4
project/jni/Android.mk
View File

@@ -17,11 +17,11 @@ $(info Cannot determine NDK version, assuming NDK r5b - please do not rename NDK
NDK_VERSION := r5b NDK_VERSION := r5b
endif endif
ifneq ($(findstring -crystax,$(NDK_VERSION)),) ifneq ($(findstring r4-crystax,$(NDK_VERSION)),)
$(info Building with CrystaX toolchain - internal STLPort disabled) $(info Building with CrystaX toolchain - internal STLPort disabled)
CRYSTAX_TOOLCHAIN := 1 CRYSTAX_TOOLCHAIN := 1
endif endif
ifneq ($(findstring r5b,$(NDK_VERSION)),) ifneq ($(findstring r5b,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION)),)
$(info Building with NDK r5b - internal STLPort disabled) $(info Building with NDK r5b - internal STLPort disabled)
NDK_R5_TOOLCHAIN := 1 NDK_R5_TOOLCHAIN := 1
endif endif

4
project/jni/application/setEnvironment-r5b.sh
View File

@@ -25,8 +25,8 @@ LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd` LOCAL_PATH=`cd $LOCAL_PATH && pwd`
echo LOCAL_PATH $LOCAL_PATH echo LOCAL_PATH $LOCAL_PATH
if [ -z "`echo $NDK | grep 'android-ndk-r5b'`" ] ; then if [ -z "`echo $NDK | grep 'android-ndk-r5b'``echo $NDK | grep 'android-ndk-r5-crystax'`" ] ; then
echo "The only supported NDK version is android-ndk-r5b, please download it from http://developer.android.com/" echo "The only supported NDK versions are android-ndk-r5b or android-ndk-r5-crystax"
exit 1 exit 1
fi fi