summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2013-03-12 10:47:08 -0500
committerJason Parker <jparker@digium.com>2013-03-12 10:47:08 -0500
commitaf7eee52de1bbf84eecdac2f4fc926a553cc30ed (patch)
tree03951026e107268d747eaac9c15dcdb6aa463239 /third_party
parentaf93a26aa321d3620925e5df68574226ba6cec3c (diff)
parent3ebc56ad37b5254faadec0ca4eeae9559338815b (diff)
Merge branch 'patch/configurable-resample' of github.com:asterisk/pjprojectHEADmaster
Diffstat (limited to 'third_party')
-rw-r--r--third_party/build/Makefile2
-rw-r--r--third_party/build/os-auto.mak.in4
-rw-r--r--third_party/build/os-darwinos.mak2
-rw-r--r--third_party/build/os-linux.mak2
-rw-r--r--third_party/build/os-win32.mak2
5 files changed, 11 insertions, 1 deletions
diff --git a/third_party/build/Makefile b/third_party/build/Makefile
index 8cfe9cf..e1cb0da 100644
--- a/third_party/build/Makefile
+++ b/third_party/build/Makefile
@@ -1,4 +1,4 @@
-DIRS = resample milenage
+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 dfc32a9..8be9597 100644
--- a/third_party/build/os-auto.mak.in
+++ b/third_party/build/os-auto.mak.in
@@ -36,3 +36,7 @@ ifeq (@ac_external_srtp@,1)
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 a9c740f..6a53b71 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 a9c740f..6a53b71 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 a9c740f..6a53b71 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