Changeset 6120 for pjproject/trunk/pjsip/build/Makefile

Timestamp:

Dec 19, 2019 2:57:20 AM (5 years ago)

Author:

nanang

Message:

Fix #2256: Mini refactored Android configure script:

• added CXXFLAGS & LDFLAGS parsing (from ndk-build output), CXXFLAGS was set to CFLAGS.
• updated WebRTC instruction set to use SSE2, was generic, for Android emulator (x86 ABI).
• updated C++ library/STL backend to use c++_shared, somehow '-lc++_static' is ignored after the refactor, also the official NDK docs mentions that c++_static may cause undefined behavior for app with multiple shared libraries (note pjsua2 app may use other shared libraries).

File:

• pjproject/trunk/pjsip/build/Makefile (modified) (2 diffs)

pjproject/trunk/pjsip/build/Makefile

@@ -47 +47 @@
                    $(CC_INC)../../pjnath/include \
                    $(CC_INC)../../pjmedia/include
-export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
-                   $(HOST_CXXFLAGS) $(CXXFLAGS)
+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
 export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \
                    $(APP_THIRD_PARTY_EXT) \
@@ -141 +145 @@
                            siptypes.o call.o presence.o media.o
 export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
-export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS) 
+export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS)
 export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
                              $(PJSIP_UA_LDLIB) \