summaryrefslogtreecommitdiff
path: root/build.mak.in
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 /build.mak.in
parentaf93a26aa321d3620925e5df68574226ba6cec3c (diff)
parent3ebc56ad37b5254faadec0ca4eeae9559338815b (diff)
Merge branch 'patch/configurable-resample' of github.com:asterisk/pjprojectHEADmaster
Diffstat (limited to 'build.mak.in')
-rw-r--r--build.mak.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/build.mak.in b/build.mak.in
index e436667..476c23d 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -44,6 +44,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$
endif
endif
+ifeq (@ac_pjmedia_resample@,libresample)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
ifeq ($(PJ_SHARED_LIBRARIES),)
ifeq (@ac_resample_dll@,1)
@@ -57,6 +58,7 @@ else
APP_THIRD_PARTY_LIBS += -lresample
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
endif
+endif
ifneq (@ac_no_gsm_codec@,1)
ifeq (@ac_external_gsm@,1)