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

Timestamp:

Jan 3, 2014 3:44:05 AM (11 years ago)

Author:

nanang

Message:

Close #1720:

• Added configure flags --with-external-srtp and --disable-resample.
• Added macro setting PJMEDIA_LIBSRTP_AUTO_INIT_DEINIT to allow application to handle libsrtp init & deinit by itself.

File:

• pjproject/trunk/pjmedia/build/Makefile (modified) (3 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -3 +3 @@
 
 THIRD_PARTY:=$(PJDIR)/third_party
-
-SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \
-         $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \
-         $(CC_INC)$(THIRD_PARTY)/srtp/include
 
 include $(PJDIR)/build/common.mak
@@ -49 +45 @@
                    $(CC_INC)../../pjmedia/include \
                    $(CC_INC)../../pjnath/include \
-                   $(CC_INC)../.. \
-                   $(SRTP_INC) 
+                   $(CC_INC)../..
 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
                    $(HOST_CXXFLAGS) $(CXXFLAGS)
@@ -72 +67 @@
                         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_resample.o resample_libsamplerate.o resample_speex.o \
                         resample_port.o rtcp.o rtcp_xr.o rtp.o \
                         sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \