Ignore:
Timestamp:
Dec 19, 2019 11:31:55 AM (12 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/build/Makefile

    r6121 r6122  
    4848                   $(CC_INC)../../pjmedia/include 
    4949export _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 
     50                   $(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS) 
    5551export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \ 
    5652                   $(APP_THIRD_PARTY_EXT) \ 
     
    145141                           siptypes.o call.o presence.o media.o 
    146142export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
    147 export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) 
     143export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS) 
    148144export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \ 
    149145                             $(PJSIP_UA_LDLIB) \ 
Note: See TracChangeset for help on using the changeset viewer.