Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes for NDK r5e new 64-bit toolchain

  • Loading branch information...
commit 5065c1ae8e3d051ce47020edd43c7d75941a1d1c 1 parent 68271a5
@pelya authored
View
4 project/jni/application/Android.mk
@@ -50,9 +50,9 @@ LOCAL_STATIC_LIBRARIES := $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBR
APP_STL := gnustl_static
-LOCAL_STATIC_LIBRARIES += gnustl_static
+#LOCAL_STATIC_LIBRARIES += gnustl_static
-LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
+LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz # -lgnustl_static
LOCAL_LDFLAGS := -Lobj/local/armeabi
View
14 project/jni/application/setEnvironment-armeabi-v7a.sh
@@ -18,14 +18,19 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
+grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
+
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
GCCVER=4.6
PLATFORMVER=android-14
LOCAL_PATH=`dirname $0`
-LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+if which realpath > /dev/null ; then
+ LOCAL_PATH=`realpath $LOCAL_PATH`
+else
+ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+fi
ARCH=armeabi-v7a
-#echo LOCAL_PATH $LOCAL_PATH
APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
APP_AVAILABLE_STATIC_LIBS=`grep 'APP_AVAILABLE_STATIC_LIBS [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
@@ -46,8 +51,8 @@ MISSING_LIB=
CFLAGS="\
-fpic -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
-no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb \
--Os -g -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
--DANDROID -O2 -g -finline-functions -Wa,--noexecstack \
+-fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
+-DANDROID -DNDEBUG -O2 -g -finline-functions -Wa,--noexecstack \
-isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include \
-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/include \
-isystem$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH/include \
@@ -55,7 +60,6 @@ CFLAGS="\
`echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-isystem$LOCAL_PATH/../\1/include@g\"` \
$MISSING_INCLUDE $CFLAGS"
-
if [ -z "$SHARED_LIBRARY_NAME" ]; then
SHARED_LIBRARY_NAME=libapplication.so
fi
View
3  project/jni/application/setEnvironment.sh
@@ -18,6 +18,8 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
+grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
+
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
GCCVER=4.6
@@ -28,7 +30,6 @@ if which realpath > /dev/null ; then
else
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
fi
-#echo LOCAL_PATH $LOCAL_PATH
ARCH=armeabi
APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
Please sign in to comment.
Something went wrong with that request. Please try again.