Changeset 342

Timestamp:

Mar 20, 2006 4:59:23 PM (19 years ago)

Author:

bennylp

Message:

Added sndinfo sample and tested samples on MacOSX Jaguar

Location:

pjproject/trunk/pjsip-apps

Files:

• build/Makefile (modified) (3 diffs)
• build/Samples-vc.mak (modified) (1 diff)
• build/Samples.mak (modified) (3 diffs)
• src/samples/playsine.c (modified) (1 diff)
• src/samples/sndinfo.c (added)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -62 +62 @@
 #
 #
-TARGETS := pjsua pjsip-perf
+TARGETS := pjsua pjsip-perf samples
 
 .PHONY: $(TARGETS)
@@ -82 +82 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $(PJSUA_EXE)
 
+samples:
+        $(MAKE) -f Samples.mak
 
 .PHONY: ../lib/pjsua.ko
@@ -90 +92 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $@
         $(MAKE) -f $(RULES_MAK) APP=PJSIPPERF app=pjsip-perf $@
+        $(MAKE) -f Samples.mak $@
         @if test "$@" == "depend"; then \
           echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \

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

@@ -39 +39 @@
 
 SAMPLES = $(BINDIR)\simpleua.exe $(BINDIR)\playfile.exe $(BINDIR)\playsine.exe \
-          $(BINDIR)\confsample.exe
+          $(BINDIR)\confsample.exe $(BINDIR)\sndinfo.exe
 
 all: $(OBJDIR) $(SAMPLES)

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

@@ -20 +20 @@
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
-export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
-                   $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
+
+export LIBS :=  $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \
+                $(subst /,$(HOST_PSEP),$(PJLIB_LIB))
+
+
+export _LDFLAGS := $(LIBS) \
                    $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
                    $(LDFLAGS) -lm
@@ -38 +42 @@
 LDFLAGS = $(_LDFLAGS)
 
-SAMPLES := simpleua
+SAMPLES := simpleua playfile playsine confsample sndinfo
+
 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE))
 
 all: $(OBJDIR) $(EXES)
 
-$(BINDIR)/%-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT)
+$(BINDIR)/%-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(LIBS)
         $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
             $(subst /,$(HOST_PSEP),$<) \
@@ -56 +61 @@
         $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
 
+depend:
+
 clean:
         $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR))
         $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR))
+        $(subst @@,$(EXES),$(HOST_RM))
 
 distclean realclean: clean
-        $(subst @@,$(EXES),$(HOST_RM))
 #       $(subst @@,$(subst /,$(HOST_PSEP),$(EXES)) $(subst /,$(HOST_PSEP),$(EXES)),$(HOST_RM))
 #       $(subst @@,$(DEP_FILE),$(HOST_RM))

pjproject/trunk/pjsip-apps/src/samples/playsine.c

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-
-#include <pjmedia.h>
 
 /*