Changeset 6120
- Timestamp:
- Dec 19, 2019 2:57:20 AM (5 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 1 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r6110 r6120 9023 9023 ac_webrtc_instset=mips 9024 9024 ;; 9025 x86*) 9026 ac_webrtc_instset=sse2 9027 ;; 9025 9028 *) 9026 9029 ac_webrtc_instset=generic -
pjproject/trunk/aconfigure.ac
r6110 r6120 2085 2085 ac_webrtc_instset=mips 2086 2086 ;; 2087 x86*) 2088 ac_webrtc_instset=sse2 2089 ;; 2087 2090 *) 2088 2091 ac_webrtc_instset=generic -
pjproject/trunk/configure-android
r6033 r6120 67 67 ADD_CFLAGS="0" 68 68 ADD_CXXFLAGS="0" 69 ADD_LDFLAGS="0" 69 70 ADD_NDK_TOOLCHAIN="0" 70 71 ADD_NDK_TARGET="0" 71 72 if test "x${IGNORE_CFLAGS}" = "x"; then 72 IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias\|\-\<g\>" 73 IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias\|\-\<g\>\|\-DNDEBUG\|\-O" 74 fi 75 if test "x${IGNORE_CPPFLAGS}" = "x"; then 76 IGNORE_CPPFLAGS="\-M\|\-f*stack\|\-f*alias\|\-\<g\>\|\-DNDEBUG\|\-O\|\-std\=" 73 77 fi 74 78 … … 85 89 fi 86 90 87 88 89 91 #echo "=====" 92 #echo "NDK_OUT : ${NDK_OUT}" 93 #echo "=====" 90 94 91 95 for i in $NDK_OUT; do … … 97 101 continue 98 102 fi 103 if test "$i" = "-c"; then 104 continue 105 fi 99 106 if test "x`echo $i|grep 'dummy'`" != "x"; then 100 107 continue 101 108 fi 102 if test "x`echo $i|grep '\-\-sysroot='`" != "x"; then 103 ANDROID_SYSROOT=`echo $i|sed 's/--sysroot=//'`; 104 fi 105 NDK_CXXFLAGS="${NDK_CXXFLAGS} $i" 109 if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" = "x"; then 110 NDK_CXXFLAGS="${NDK_CXXFLAGS} $i" 111 fi 106 112 continue 107 113 fi … … 133 139 fi 134 140 141 # Parse NDK LDFLAGS 142 if test "${ADD_LDFLAGS}" = "1"; then 143 if test "$i" = "-o"; then 144 ADD_LDFLAGS="0" 145 continue 146 fi 147 if test "x`echo $i|grep 'dummy'`" != "x"; then 148 continue 149 fi 150 if test "x`echo $i|grep '.so'`" != "x"; then 151 continue 152 fi 153 NDK_LDFLAGS="${NDK_LDFLAGS} $i" 154 continue 155 fi 156 135 157 # Find gcc or clang 136 158 if test "x${NDK_CC}" = "x"; then … … 142 164 #echo "---using llvm" 143 165 fi 166 continue 144 167 fi 145 168 fi … … 150 173 NDK_CXX=$i 151 174 ADD_CXXFLAGS="1" 175 continue 176 fi 177 fi 178 179 # Find linking/LDFLAGS 180 if test "x${NDK_LDFLAGS}" = "x"; then 181 if test "x`echo $i | grep '\-\<shared\>'`" != "x"; then 182 ADD_LDFLAGS="1" 183 continue 152 184 fi 153 185 fi 154 186 155 187 # Find ar tool 156 if test "x${NDK_AR}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\-ar'`" != "x"; then 157 if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then 188 if test "x${NDK_AR}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\-\<ar\>'`" != "x"; then 189 # In some NDKs, e.g: r17c, gcc/clang and ar have different path 190 #if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then 158 191 NDK_AR=$i 159 192 #echo "--- found AR=${NDK_AR}" 160 fi 193 continue 194 #fi 161 195 fi 162 196 163 197 # Find ranlib tool 164 if test "x${NDK_RANLIB}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\- ranlib'`" != "x"; then165 if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then198 if test "x${NDK_RANLIB}" = "x" -a "x${NDK_CC}" != "x" -a "x`echo $i|grep '\-\<ranlib\>'`" != "x"; then 199 #if test "$(dirname \"${NDK_CC}\")" = "$(dirname \"${i}\")"; then 166 200 NDK_RANLIB=$i 167 201 #echo "--- found RANLIB=${NDK_RANLIB}" 168 fi202 #fi 169 203 fi 170 204 done … … 193 227 NDK_AR=`find ${NDK_CC_DIR} -name "*ar" | grep -m 1 -v "gcc"` 194 228 fi 195 export LDFLAGS="${LDFLAGS} --sysroot=${ANDROID_SYSROOT}"229 export LDFLAGS="${LDFLAGS}" 196 230 else 197 231 # find ar and ranlib … … 202 236 NDK_RANLIB=`find ${NDK_TOOLCHAIN}/bin/ -name "*-ranlib" | grep -m 1 -v "gcc"` 203 237 fi 204 export LDFLAGS="${LDFLAGS} - -sysroot=${ANDROID_SYSROOT} -target ${NDK_TARGET} -gcc-toolchain ${NDK_TOOLCHAIN}"238 export LDFLAGS="${LDFLAGS} -target ${NDK_TARGET} -gcc-toolchain ${NDK_TOOLCHAIN}" 205 239 fi 206 240 … … 220 254 export CXX="${NDK_CXX}" 221 255 222 export LIBS="${LIBS} -lc -lgcc -ldl" 256 export LDFLAGS="${NDK_LDFLAGS}" 257 export LIBS="${LIBS}" 223 258 export CFLAGS="${NDK_CFLAGS} ${CFLAGS}" 224 export CPPFLAGS="${ CFLAGS} -fexceptions -frtti"225 export CXXFLAGS="${ NDK_CXXFLAGS} -fexceptions -frtti"259 export CPPFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}" 260 export CXXFLAGS="${CPPFLAGS}" 226 261 227 262 else … … 272 307 # llvm 273 308 STDCPP_TC="${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++" 274 STDCPP_CFLAGS="-I${STDCPP_TC}/include" 275 STDCPP_LIBS="-lc++_static -lc++abi" 276 STDCPP_LDFLAGS="-L${STDCPP_TC}/libs/${TARGET_ABI}/" 309 #STDCPP_CFLAGS="-I${STDCPP_TC}/include" 310 #STDCPP_LIBS="-lc++_static -lc++abi" 311 STDCPP_LIBS="${STDCPP_TC}/libs/${TARGET_ABI}/libc++_shared.so" 312 #STDCPP_LDFLAGS="-L${STDCPP_TC}/libs/${TARGET_ABI}/" 277 313 else 278 314 # gnustl … … 291 327 export LIBS="${STDCPP_LIBS} ${LIBS}" 292 328 export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}" 329 export CPPFLAGS="${CPPFLAGS} ${STDCPP_CFLAGS}" 330 export CXXFLAGS="${CPPFLAGS}" 293 331 294 332 # Print settings -
pjproject/trunk/pjsip-apps/src/samples/android_sample/jni/Android.mk
r5932 r6120 2 2 3 3 include $(CLEAR_VARS) 4 5 4 LOCAL_MODULE := dummy_static 6 LOCAL_SRC_FILES := dummy.c 7 5 LOCAL_SRC_FILES := dummy.c dummy2.cc 8 6 include $(BUILD_STATIC_LIBRARY) 9 7 … … 11 9 LOCAL_MODULE := dummy_shared 12 10 LOCAL_STATIC_LIBRARIES := dummy_static 13 LOCAL_SRC_FILES := dummy.c 14 11 LOCAL_SRC_FILES := dummy.c dummy2.cc 15 12 include $(BUILD_SHARED_LIBRARY) -
pjproject/trunk/pjsip-apps/src/samples/android_sample/jni/Application.mk
r5409 r6120 1 1 APP_ABI := all 2 APP_CPPFLAGS := -fexceptions -frtti 3 APP_STL := c++_shared -
pjproject/trunk/pjsip-apps/src/swig/java/Makefile
r5895 r6120 164 164 ifeq ($(OS),android) 165 165 mkdir -p android/app/src/main/jniLibs/$(TARGET_ARCH) 166 # copy libc++_shared.so manually 167 cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so android/app/src/main/jniLibs/$(TARGET_ARCH) 166 168 endif 167 169 $(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o \ 168 $(MY_ CFLAGS) $(MY_LDFLAGS)170 $(MY_LDFLAGS) 169 171 170 172 $(OUT_DIR)/pjsua2_wrap.o: $(OUT_DIR)/pjsua2_wrap.cpp Makefile -
pjproject/trunk/pjsip-apps/src/swig/java/android/app/build.gradle
r5502 r6120 13 13 moduleName "libpjsua2" 14 14 } 15 16 externalNativeBuild { 17 cmake { 18 arguments "-DANDROID_STL=c++_shared" 19 } 20 } 15 21 } 16 22 -
pjproject/trunk/pjsip/build/Makefile
r5761 r6120 47 47 $(CC_INC)../../pjnath/include \ 48 48 $(CC_INC)../../pjmedia/include 49 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 50 $(HOST_CXXFLAGS) $(CXXFLAGS) 49 export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 50 $(HOST_CXXFLAGS) $(CXXFLAGS) $(CC_INC)../include \ 51 $(CC_INC)../../pjlib/include \ 52 $(CC_INC)../../pjlib-util/include \ 53 $(CC_INC)../../pjnath/include \ 54 $(CC_INC)../../pjmedia/include 51 55 export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \ 52 56 $(APP_THIRD_PARTY_EXT) \ … … 141 145 siptypes.o call.o presence.o media.o 142 146 export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 143 export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS)147 export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) 144 148 export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \ 145 149 $(PJSIP_UA_LDLIB) \ -
pjproject/trunk/third_party/build/webrtc/Makefile
r5428 r6120 21 21 $(CFLAGS) $(CC_INC). $(CC_INC)../../webrtc/src \ 22 22 $(CC_INC)../../../pjlib/include 23 export _CXXFLAGS:= $( _CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \23 export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 24 24 $(HOST_CXXFLAGS) $(CXXFLAGS) 25 25 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ -
pjproject/trunk/third_party/build/yuv/Makefile
r6032 r6120 20 20 $(CFLAGS) $(CC_INC). $(CC_INC)../../yuv/include \ 21 21 $(CC_INC)../../../pjlib/include 22 export _CXXFLAGS:= $( _CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \23 $(HOST_CXXFLAGS) $(CXXFLAGS) 22 export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 23 $(HOST_CXXFLAGS) $(CXXFLAGS) $(CC_INC). $(CC_INC)../../yuv/include 24 24 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 25 25 $(LDFLAGS)
Note: See TracChangeset
for help on using the changeset viewer.