diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-01-03 03:44:05 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-01-03 03:44:05 +0000 |
| commit | 499bda86d351aed23348aa38103738231ae7d4c1 (patch) | |
| tree | 0081194ef6f5ddfe6c32f8f1624429418abaea69 /third_party | |
| parent | f00de059ddcdc4252b313b4194bc9fdd4b053c38 (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4701 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/build/Makefile | 2 | ||||
| -rw-r--r-- | third_party/build/os-auto.mak.in | 9 | ||||
| -rw-r--r-- | third_party/build/os-darwinos.mak | 2 | ||||
| -rw-r--r-- | third_party/build/os-linux.mak | 2 | ||||
| -rw-r--r-- | third_party/build/os-win32.mak | 2 |
5 files changed, 16 insertions, 1 deletions
diff --git a/third_party/build/Makefile b/third_party/build/Makefile index 36d80612..e1cb0da2 100644 --- a/third_party/build/Makefile +++ b/third_party/build/Makefile @@ -1,4 +1,4 @@ -DIRS = resample milenage srtp +DIRS = milenage include ../../build.mak include $(PJDIR)/build/common.mak diff --git a/third_party/build/os-auto.mak.in b/third_party/build/os-auto.mak.in index f1de03f8..8be95970 100644 --- a/third_party/build/os-auto.mak.in +++ b/third_party/build/os-auto.mak.in @@ -31,3 +31,12 @@ DIRS += portaudio endif endif +ifeq (@ac_external_srtp@,1) +# External SRTP +else +DIRS += srtp +endif + +ifeq (@ac_pjmedia_resample@,libresample) +DIRS += resample +endif diff --git a/third_party/build/os-darwinos.mak b/third_party/build/os-darwinos.mak index a9c740f7..6a53b712 100644 --- a/third_party/build/os-darwinos.mak +++ b/third_party/build/os-darwinos.mak @@ -3,5 +3,7 @@ DIRS += ilbc DIRS += speex DIRS += portaudio DIRS += g7221 +DIRS += srtp +DIRS += resample diff --git a/third_party/build/os-linux.mak b/third_party/build/os-linux.mak index a9c740f7..6a53b712 100644 --- a/third_party/build/os-linux.mak +++ b/third_party/build/os-linux.mak @@ -3,5 +3,7 @@ DIRS += ilbc DIRS += speex DIRS += portaudio DIRS += g7221 +DIRS += srtp +DIRS += resample diff --git a/third_party/build/os-win32.mak b/third_party/build/os-win32.mak index a9c740f7..6a53b712 100644 --- a/third_party/build/os-win32.mak +++ b/third_party/build/os-win32.mak @@ -3,5 +3,7 @@ DIRS += ilbc DIRS += speex DIRS += portaudio DIRS += g7221 +DIRS += srtp +DIRS += resample |