summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/build/Makefile2
-rw-r--r--third_party/build/os-auto.mak.in9
-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, 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