diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-01-16 05:30:46 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-01-16 05:30:46 +0000 |
| commit | e56ea14ab8531ee3cec375460577d1b89bf62e26 (patch) | |
| tree | df77c3acb961514b2022ee9e030071b691145920 /configure-android | |
| parent | bd1c47e995a3a844868f1d4dcc8f77f163ae721b (diff) | |
Closed #1723: Merging pjsua2 branch into trunk
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4704 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'configure-android')
| -rwxr-xr-x | configure-android | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/configure-android b/configure-android index c8fc8f97..02298a97 100755 --- a/configure-android +++ b/configure-android @@ -101,8 +101,8 @@ if test "$1" = "--use-ndk-cflags"; then export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}/usr/lib/" export LIBS="${LIBS} -lc -lgcc" export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" - export CPPFLAGS="${CFLAGS}" - export CXXFLAGS="${NDK_CXXFLAGS}" + export CPPFLAGS="${CFLAGS} -fexceptions -frtti" + export CXXFLAGS="${NDK_CXXFLAGS} -fexceptions -frtti" else @@ -127,11 +127,29 @@ else export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}/usr/lib/" export LIBS="${LIBS} -lc -lgcc" export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include" - export CPPFLAGS="${CFLAGS}" - export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT}" + export CPPFLAGS="${CFLAGS} -fexceptions -frtti" + export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT} -fexceptions -frtti" fi +# C++ STL +# Note: STL for pjsua2 sample app is specified in pjsip-apps/src/swig/java/android/jni/Application.mk + +# gnustl +STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1` +STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/armeabi/include" +STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lgnustl_static" +STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/armeabi" + +# stlport +#STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport" +#STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lstlport_static -ldl" +#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi" + +export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}" +export LIBS="${STDCPP_LIBS} ${LIBS}" +export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}" + # Print settings if test "1" = "1"; then echo "$F: calling ./configure with env vars:" |