Changeset 4705 for pjproject/trunk/pjsip-apps/build/Samples.mak

Timestamp:

Jan 16, 2014 6:33:19 AM (10 years ago)

Author:

ming

Message:

Re #1723: Fixed compilation and linking errors

File:

• pjproject/trunk/pjsip-apps/build/Samples.mak (modified) (2 diffs)

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -30 +30 @@
            pjsip-perf \
            pcaputil \
+           pjsua2_demo \
            playfile \
            playsine \
@@ -49 +50 @@
 EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE))
 
-PJSUA2_SAMPLES := pjsua2_demo
+.PHONY: $(EXES)
 
-PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE))
-
-.PHONY: $(EXES)
-.PHONY: $(PJSUA2_EXES)
-
-all: $(EXES) $(PJSUA2_EXES)
+all: $(EXES)
 
 $(EXES):
-        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
-
-$(PJSUA2_EXES):
-        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" 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) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
 
 depend: