summaryrefslogtreecommitdiff
path: root/pjmedia/build/Makefile
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2008-01-23 20:39:07 +0000
committerBenny Prijono <bennylp@teluu.com>2008-01-23 20:39:07 +0000
commit8686b3135348bcd69bdb3c3cb6660a82d989bb30 (patch)
tree31d9c111724f083782ba5782c58ab2d30a867933 /pjmedia/build/Makefile
parent5035ea445fbf6de061efacd90c66390ca15806ed (diff)
Ticket #61: Implement SRTP support in PJMEDIA and PJSUA-LIB, and updated applications because of the changes. This is a major modification back ported from SRTP branch. See ticket #61 for changelog detail of this commit
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1735 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build/Makefile')
-rw-r--r--pjmedia/build/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index ce0b887a..42f4684c 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -3,6 +3,10 @@ include ../../build.mak
THIRD_PARTY:=$(PJDIR)/third_party
PA_DIR := $(THIRD_PARTY)/build/portaudio/src
+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
RULES_MAK := $(PJDIR)/build/rules.mak
@@ -25,7 +29,8 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
$(CC_INC)../../pjlib/include \
$(CC_INC)../../pjlib-util/include \
$(CC_INC)../../pjnath/include \
- $(CC_INC)../..
+ $(CC_INC)../.. \
+ $(SRTP_INC)
export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
$(HOST_CXXFLAGS) $(CXXFLAGS)
export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \
@@ -48,7 +53,8 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
resample_resample.o resample_libsamplerate.o \
resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
session.o silencedet.o sound_port.o stream.o \
- tonegen.o transport_ice.o transport_udp.o \
+ tonegen.o transport_ice.o transport_srtp.o \
+ transport_udp.o \
wav_player.o wav_playlist.o wav_writer.o wave.o \
$(SOUND_OBJS) $(NULLSOUND_OBJS)