Changeset 6120 for pjproject/trunk/third_party/build/yuv/Makefile

Timestamp:

Dec 19, 2019 2:57:20 AM (4 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/third_party/build/yuv/Makefile (modified) (1 diff)

pjproject/trunk/third_party/build/yuv/Makefile

@@ -20 +20 @@
                    $(CFLAGS) $(CC_INC). $(CC_INC)../../yuv/include \
                    $(CC_INC)../../../pjlib/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). $(CC_INC)../../yuv/include
 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
                    $(LDFLAGS)