Re #2256: Readjusted build configs (after r6120 & r6121) to accomodate the convention that CXXFLAGS always includes CFLAGS in all PJSIP modules.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@6122 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Nanang Izzuddin
parent
1a1db21d52
commit
a414fb61f4
|
|
@ -106,9 +106,21 @@ if test "$1" = "--use-ndk-cflags" || [ "${NDK_VER}" -ge "17" ]; then
|
|||
if test "x`echo $i|grep 'dummy'`" != "x"; then
|
||||
continue
|
||||
fi
|
||||
if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" = "x"; then
|
||||
NDK_CXXFLAGS="${NDK_CXXFLAGS} $i"
|
||||
if test "x`echo $i|grep ${IGNORE_CPPFLAGS}`" != "x"; then
|
||||
continue
|
||||
fi
|
||||
# Check if flag is already in CFLAGS
|
||||
ISDUP="0"
|
||||
for j in $NDK_CFLAGS; do
|
||||
if test "$i" = "$j"; then
|
||||
ISDUP="1"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test "${ISDUP}" = "1"; then
|
||||
continue
|
||||
fi
|
||||
NDK_CXXFLAGS="${NDK_CXXFLAGS} $i"
|
||||
continue
|
||||
fi
|
||||
|
||||
|
|
@ -253,11 +265,11 @@ if test "$1" = "--use-ndk-cflags" || [ "${NDK_VER}" -ge "17" ]; then
|
|||
export CC="${NDK_CC}"
|
||||
export CXX="${NDK_CXX}"
|
||||
|
||||
export LDFLAGS="${NDK_LDFLAGS}"
|
||||
export CPPFLAGS="${CPPFLAGS}"
|
||||
export CFLAGS="${NDK_CFLAGS} ${CFLAGS} ${CPPFLAGS}"
|
||||
export CXXFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}"
|
||||
export LDFLAGS="${NDK_LDFLAGS} ${LDFLAGS}"
|
||||
export LIBS="${LIBS}"
|
||||
export CFLAGS="${NDK_CFLAGS} ${CFLAGS}"
|
||||
export CPPFLAGS="${NDK_CXXFLAGS} ${CPPFLAGS}"
|
||||
export CXXFLAGS="${CPPFLAGS}"
|
||||
|
||||
else
|
||||
|
||||
|
|
@ -323,11 +335,11 @@ fi
|
|||
#STDCPP_LIBS="-lstlport_static -ldl"
|
||||
#STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}"
|
||||
|
||||
export CFLAGS="${CFLAGS} ${STDCPP_CFLAGS}"
|
||||
export LIBS="${STDCPP_LIBS} ${LIBS}"
|
||||
export CFLAGS="${CFLAGS}"
|
||||
export LIBS="${LIBS} ${STDCPP_LIBS}"
|
||||
export LDFLAGS="${LDFLAGS} ${STDCPP_LDFLAGS}"
|
||||
export CPPFLAGS="${CPPFLAGS} ${STDCPP_CFLAGS}"
|
||||
export CXXFLAGS="${CPPFLAGS}"
|
||||
export CPPFLAGS="${CPPFLAGS}"
|
||||
export CXXFLAGS="${CXXFLAGS} ${STDCPP_CFLAGS}"
|
||||
|
||||
# Print settings
|
||||
if test "1" = "1"; then
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@ fi
|
|||
# Other settings to feed to configure script.
|
||||
#ARCH="-arch armv6"
|
||||
export CFLAGS="${CFLAGS} -DPJ_SDK_NAME=\"\\\"`basename $SDKPATH`\\\"\" ${ARCH} -isysroot ${SDKPATH}"
|
||||
export CXXFLAGS="${CFLAGS}"
|
||||
export LDFLAGS="${LDFLAGS} ${ARCH} -isysroot ${SDKPATH} -framework AudioToolbox -framework Foundation"
|
||||
export AR="${TCPATH}/usr/bin/libtool -static -o"
|
||||
export AR_FLAGS=" "
|
||||
|
|
|
|||
|
|
@ -47,11 +47,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
|
|||
$(CC_INC)../../pjnath/include \
|
||||
$(CC_INC)../../pjmedia/include
|
||||
export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS) $(CC_INC)../include \
|
||||
$(CC_INC)../../pjlib/include \
|
||||
$(CC_INC)../../pjlib-util/include \
|
||||
$(CC_INC)../../pjnath/include \
|
||||
$(CC_INC)../../pjmedia/include
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS)
|
||||
export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
|
||||
$(APP_THIRD_PARTY_EXT) \
|
||||
$(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
|
||||
|
|
@ -144,7 +140,7 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
|
|||
account.o endpoint.o json.o persistent.o types.o \
|
||||
siptypes.o call.o presence.o media.o
|
||||
export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
|
||||
export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS)
|
||||
export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS)
|
||||
export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
|
||||
$(PJSIP_UA_LDLIB) \
|
||||
$(PJSIP_SIMPLE_LDLIB) \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
|
|||
$(CFLAGS) $(CC_INC). $(CC_INC)../../webrtc/src \
|
||||
$(CC_INC)../../../pjlib/include
|
||||
export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS)
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS)
|
||||
export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
|
||||
$(LDFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
|
|||
$(CFLAGS) $(CC_INC). $(CC_INC)../../yuv/include \
|
||||
$(CC_INC)../../../pjlib/include
|
||||
export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS) $(CC_INC). $(CC_INC)../../yuv/include
|
||||
$(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS)
|
||||
export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
|
||||
$(LDFLAGS)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue