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

Timestamp:

Dec 19, 2019 11:31:55 AM (5 years ago)

Author:

nanang

Message:

Re #2256: Readjusted build configs (after r6120 & r6121) to accomodate the convention that CXXFLAGS always includes CFLAGS in all PJSIP modules.

File:

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

pjproject/trunk/pjsip/build/Makefile

@@ -48 +48 @@
                    $(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) \
@@ -145 +141 @@
                            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) \