Ignore:
Timestamp:
Jan 23, 2014 2:28:41 AM (7 years ago)
Author:
ming
Message:

Re #1723: Modified build system to link with C++ library only for pjsua2 lib or app

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/build/Samples.mak

    r4705 r4711  
    1111export _CXXFLAGS:= $(PJ_CXXFLAGS) 
    1212export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
     13export _LDXXFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) 
    1314 
    1415SRCDIR := ../src/samples 
     
    3031           pjsip-perf \ 
    3132           pcaputil \ 
    32            pjsua2_demo \ 
    3333           playfile \ 
    3434           playsine \ 
     
    4848           vid_streamutil 
    4949 
     50PJSUA2_SAMPLES := pjsua2_demo 
     51 
    5052EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) 
     53PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) 
    5154 
    5255.PHONY: $(EXES) 
     56.PHONY: $(PJSUA2_EXES) 
    5357 
    54 all: $(EXES) 
     58all: $(EXES) $(PJSUA2_EXES) 
    5559 
    5660$(EXES): 
    57         $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 
     61        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 
     62 
     63$(PJSUA2_EXES): 
     64        $(MAKE) --no-print-directory -f $(RULES_MAK) PJSUA2_SAMPLE_SRCDIR=$(SRCDIR) PJSUA2_SAMPLE_OBJS=$@.o PJSUA2_SAMPLE_CFLAGS="$(_CFLAGS)" PJSUA2_SAMPLE_CXXFLAGS="$(_CXXFLAGS)" PJSUA2_SAMPLE_LDFLAGS="$(_LDXXFLAGS)" PJSUA2_SAMPLE_EXE=$@ APP=PJSUA2_SAMPLE app=pjsua2_sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 
    5865 
    5966depend: 
Note: See TracChangeset for help on using the changeset viewer.