diff options
author | Liong Sauw Ming <ming@teluu.com> | 2014-01-23 02:28:41 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2014-01-23 02:28:41 +0000 |
commit | f0c2e61eb1c3ee704503be5e0703aa05fac73903 (patch) | |
tree | 577225148541d11dbd58ec67a7197e8da81a85bc /pjsip-apps/build | |
parent | 355080c169d40ff20866a18bb83b53b3b3e3f9c0 (diff) |
Re #1723: Modified build system to link with C++ library only for pjsua2 lib or app
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4711 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/build')
-rw-r--r-- | pjsip-apps/build/Makefile | 12 | ||||
-rw-r--r-- | pjsip-apps/build/Samples.mak | 13 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index c776de10..62471e57 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -58,16 +58,8 @@ export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT -############################################################################### -# Main entry -# -# -# x x x x x x x x x x x x x x x x x x x x x x x x -# -# FIX THIS -# -# x x x x x x x x x x x x x x x x x x x x x x x x -TARGETS := $(BINDIR)/$(PJSUA_EXE) $(BINDIR)/$(PJSYSTEST_EXE) samples + +TARGETS := $(PJSUA_EXE) $(PJSYSTEST_EXE) samples all: $(TARGETS) diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index 65d25b9f..502f92c4 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -10,6 +10,7 @@ RULES_MAK := $(PJDIR)/build/rules.mak export _CFLAGS := $(PJ_CFLAGS) $(CFLAGS) export _CXXFLAGS:= $(PJ_CXXFLAGS) export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) +export _LDXXFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) SRCDIR := ../src/samples OBJDIR := ./output/samples-$(TARGET_NAME) @@ -29,7 +30,6 @@ SAMPLES := auddemo \ mix \ pjsip-perf \ pcaputil \ - pjsua2_demo \ playfile \ playsine \ recfile \ @@ -47,14 +47,21 @@ SAMPLES := auddemo \ tonegen \ vid_streamutil +PJSUA2_SAMPLES := pjsua2_demo + EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) +PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) .PHONY: $(EXES) +.PHONY: $(PJSUA2_EXES) -all: $(EXES) +all: $(EXES) $(PJSUA2_EXES) $(EXES): - $(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)/$@) + $(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)/$@) + +$(PJSUA2_EXES): + $(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)/$@) depend: |