Changeset 2506 for pjproject/trunk/pjmedia/build/Makefile

Timestamp:

Mar 12, 2009 6:11:37 PM (16 years ago)

Author:

bennylp

Message:

(Major) Task #737 and #738: integration of APS-Direct and Audiodev from aps-direct branch to trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/build/Makefile (modified) (10 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -19 +19 @@
 export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)
 export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT)
+export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT)
 
-NULLSOUND_OBJS := nullsound.o
 
 ###############################################################################
@@ -35 +35 @@
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
+                   $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \
                    $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \
@@ -50 +51 @@
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                         alaw_ulaw.o alaw_ulaw_table.o clock_thread.o codec.o \
-                        conference.o delaybuf.o echo_common.o echo_port.o \
-                        echo_suppress.o endpoint.o errno.o \
+                        conference.o conf_switch.o delaybuf.o echo_common.o \
+                        echo_port.o echo_suppress.o endpoint.o errno.o \
                         g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
                         null_port.o plc_common.o port.o splitcomb.o \
                         resample_resample.o resample_libsamplerate.o \
                         resample_port.o rtcp.o rtcp_xr.o rtp.o \
-                        sdp.o sdp_cmp.o sdp_neg.o \
-                        session.o silencedet.o sound_port.o stereo_port.o \
+                        sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
+                        sound_legacy.o sound_port.o stereo_port.o \
                         stream.o tonegen.o transport_adapter_sample.o \
                         transport_ice.o transport_loop.o \
                         transport_srtp.o transport_udp.o \
                         wav_player.o wav_playlist.o wav_writer.o wave.o \
-                        wsola.o $(SOUND_OBJS) $(NULLSOUND_OBJS)
+                        wsola.o
 
 export PJMEDIA_CFLAGS += $(_CFLAGS)
+
+
+###############################################################################
+# Defines for building PJMEDIA-AUDIODEV library
+#
+export PJMEDIA_AUDIODEV_SRCDIR = ../src/pjmedia-audiodev
+export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o legacy_dev.o pa_dev.o \
+                                 wmme_dev.o
+export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 
 
@@ -107 +117 @@
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-codec pjsdp pjmedia-test
+TARGETS := pjmedia pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
 
 all: $(TARGETS)
@@ -122 +132 @@
 distclean: realclean
 
-.PHONY: dep depend pjmedia pjmedia-codec pjmedia-test clean realclean distclean
+.PHONY: dep depend pjmedia pjmedia-codec pjmedia-audiodev pjmedia-test clean realclean distclean
 
 pjmedia:
@@ -129 +139 @@
 pjmedia-codec:
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB)
+
+pjmedia-audiodev:
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB)
 
 pjsdp:
@@ -153 +166 @@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
@@ -158 +172 @@
 realclean:
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-$(TARGET_NAME).depend),$(HOST_RMR))
+        $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-audiodev-$(TARGET_NAME).depend),$(HOST_RMR))
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-codec-$(TARGET_NAME).depend),$(HOST_RMR))
         $(subst @@,$(subst /,$(HOST_PSEP),.pjmedia-test-$(TARGET_NAME).depend),$(HOST_RMR))
@@ -163 +178 @@
         
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@
@@ -169 +185 @@
 depend:
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $@
+        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia-audiodev $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@
         $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@