Ignore:
Timestamp:
Jan 16, 2014 5:30:46 AM (8 years ago)
Author:
ming
Message:

Closed #1723: Merging pjsua2 branch into trunk

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/configure-android

    r4651 r4704  
    102102  export LIBS="${LIBS} -lc -lgcc" 
    103103  export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" 
    104   export CPPFLAGS="${CFLAGS}" 
    105   export CXXFLAGS="${NDK_CXXFLAGS}" 
     104  export CPPFLAGS="${CFLAGS} -fexceptions -frtti" 
     105  export CXXFLAGS="${NDK_CXXFLAGS} -fexceptions -frtti" 
    106106 
    107107else 
     
    128128  export LIBS="${LIBS} -lc -lgcc" 
    129129  export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include" 
    130   export CPPFLAGS="${CFLAGS}" 
    131   export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT}" 
     130  export CPPFLAGS="${CFLAGS} -fexceptions -frtti" 
     131  export CXXFLAGS="${CXXFLAGS} -shared --sysroot=${ANDROID_SYSROOT} -fexceptions -frtti" 
    132132 
    133133fi 
     134 
     135# C++ STL 
     136# Note: STL for pjsua2 sample app is specified in pjsip-apps/src/swig/java/android/jni/Application.mk 
     137 
     138# gnustl 
     139STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1` 
     140STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/armeabi/include" 
     141STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lgnustl_static" 
     142STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/armeabi" 
     143 
     144# stlport 
     145#STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport" 
     146#STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lstlport_static -ldl" 
     147#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/armeabi" 
     148 
     149export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}" 
     150export LIBS="${STDCPP_LIBS} ${LIBS}" 
     151export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}" 
    134152 
    135153# Print settings 
Note: See TracChangeset for help on using the changeset viewer.