Changeset 4828


Ignore:
Timestamp:
Apr 30, 2014 2:37:00 AM (7 years ago)
Author:
riza
Message:

Re #1749: Update configure-android to support intel build.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-android

    r4704 r4828  
    99  echo "where:" 
    1010  echo "  --use-ndk-cflags Optional parameter to use the same compilation flags" 
    11   echo "                   as the one used by ndk-build" 
     11  echo "                   as the one used by ndk-build. Android NDK r9 or later"    
     12  echo "                   is required when using this option." 
    1213  echo "  OPTIONS          Other options that will be passed directly to" 
    1314  echo "                   ./aconfigure script. Run ./aconfigure --help" 
     
    6465    IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias" 
    6566  fi 
    66   for i in `${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_LOG=1 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`; do 
     67  for i in `${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_TOOLCHAIN_VERSION=4.8 NDK_LOG=1 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`; do 
    6768    if test "x${NDK_CXX}" != "x" -a "$i" = "-o"; then break; fi 
    6869 
     
    100101 
    101102  export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}/usr/lib/" 
    102   export LIBS="${LIBS} -lc -lgcc" 
     103  export LIBS="${LIBS} -lc -lgcc -ldl" 
    103104  export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" 
    104105  export CPPFLAGS="${CFLAGS} -fexceptions -frtti" 
     
    138139# gnustl 
    139140STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1` 
    140 STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/armeabi/include" 
     141STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/${TARGET_ABI}/include" 
    141142STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lgnustl_static" 
    142 STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/armeabi" 
     143STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/${TARGET_ABI}/" 
    143144 
    144145# stlport 
    145146#STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport" 
    146147#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#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}" 
    148149 
    149150export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}" 
Note: See TracChangeset for help on using the changeset viewer.