Changeset 4631 for pjproject/branches/projects/pjsua2/pjsip-apps/build/Samples.mak

Timestamp:

Oct 23, 2013 5:34:48 AM (11 years ago)

Author:

bennylp

Message:

More re #1519:

• account API implementation (incomplete, callback is still not called)
• using callback class design pattern (observer?)
• after this, it might be changed to use inheritance pattern instead

File:

• pjproject/branches/projects/pjsua2/pjsip-apps/build/Samples.mak (modified) (2 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/build/Samples.mak

@@ -29 +29 @@
            pjsip-perf \
            pcaputil \
+           pjsua2_demo \
            playfile \
            playsine \
@@ -46 +47 @@
            vid_streamutil
 
+#  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
+#
+# Only pjsua2_demo is built, and also -lstdc++ is added for all
+# samples
+#  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x  x   x  x  x  x  x
+SAMPLES := pjsua2_demo
+
 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)$(HOST_EXE))
 
 all: $(BINDIR) $(OBJDIR) $(EXES)
 
-$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES)
+$(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES) 
         $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
             $(subst /,$(HOST_PSEP),$<) \
-            $(_LDFLAGS)
+             $(_LDFLAGS) -lstdc++
 
 $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
+        $(CC) $(_CFLAGS) \
+          $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+          $(subst /,$(HOST_PSEP),$<) 
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
         $(CC) $(_CFLAGS) \
           $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \