Changeset 5126


Ignore:
Timestamp:
Jul 6, 2015 7:33:40 AM (6 years ago)
Author:
riza
Message:

Misc (re #1843): Modify configure-android to support x86_64 and mips64 target.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-android

    r5006 r5126  
    5959fi 
    6060 
     61if test "$TARGET_ABI" = "x86_64" || test "$TARGET_ABI" = "mips64"; then        
     62    USR_LIB="/usr/lib64" 
     63else 
     64    USR_LIB="/usr/lib" 
     65fi  
     66 
    6167if test "$1" = "--use-ndk-cflags"; then 
    6268  shift 
     
    100106  export RANLIB=`echo ${NDK_CXX}|sed 's/-g++/-ranlib/'`; 
    101107 
    102   export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}/usr/lib/" 
     108  export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" 
    103109  export LIBS="${LIBS} -lc -lgcc -ldl" 
    104110  export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" 
     
    126132  export RANLIB="${ANDROID_TC}/bin/${TARGET_HOST}-ranlib" 
    127133 
    128   export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}/usr/lib/" 
     134  export LDFLAGS="${LDFLAGS} -nostdlib -L${ANDROID_SYSROOT}${USR_LIB}" 
    129135  export LIBS="${LIBS} -lc -lgcc" 
    130136  export CFLAGS="${CFLAGS} -I${ANDROID_SYSROOT}/usr/include" 
     
    140146STDCPP_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/[0-9]* | sort -gr | head -1` 
    141147STDCPP_CFLAGS="-I${STDCPP_TC_VER}/include -I${STDCPP_TC_VER}/libs/${TARGET_ABI}/include" 
    142 STDCPP_LIBS="${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o -lgnustl_static" 
     148STDCPP_LIBS="${ANDROID_SYSROOT}${USR_LIB}/crtbegin_so.o -lgnustl_static" 
    143149STDCPP_LDFLAGS="-L${STDCPP_TC_VER}/libs/${TARGET_ABI}/" 
    144150 
Note: See TracChangeset for help on using the changeset viewer.