diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
| commit | af93a26aa321d3620925e5df68574226ba6cec3c (patch) | |
| tree | c73301bfef50ae9ba250285bbcc7879f5c837e04 /pjmedia/build/os-linux.mak | |
| parent | 09114052f74fe74bbf652189cedefe41b7141b86 (diff) | |
| parent | 9550ec7a68b8d072f99872d44def5004dbcc2562 (diff) | |
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject
Conflicts:
build.mak.in
Diffstat (limited to 'pjmedia/build/os-linux.mak')
| -rw-r--r-- | pjmedia/build/os-linux.mak | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak index 63910c4..a6d2dd3 100644 --- a/pjmedia/build/os-linux.mak +++ b/pjmedia/build/os-linux.mak @@ -74,6 +74,21 @@ endif # +# SRTP +# +#ifeq (@ac_external_srtp@,1) +ifeq (0,1) +# External SRTP +export CFLAGS += -DPJMEDIA_EXTERNAL_SRTP=1 +else +# Our SRTP in third_party +export CFLAGS += -I$(THIRD_PARTY)/build/srtp \ + -I$(THIRD_PARTY)/srtp/crypto/include \ + -I$(THIRD_PARTY)/srtp/include + +endif + +# # PortAudio # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) |