summaryrefslogtreecommitdiff
path: root/pjmedia/build
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2010-01-13 16:28:15 +0000
committerBenny Prijono <bennylp@teluu.com>2010-01-13 16:28:15 +0000
commit2c9bdd7e514a478d3dc17a6b85a12dec20c15fb0 (patch)
treec79aed89fc63fbc64c7b23d921caea30e0bed3a1 /pjmedia/build
parent8cc7aef25ecc698b6fdfa620877f72e6b8dd536f (diff)
Ticket #1025: Support for using different PortAudio installation/path
- added --with-pa-path configure option - remove the use of PaUtil_SetDebugPrintFunction() since this is not always available across all PA versions (?) git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3058 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
-rw-r--r--pjmedia/build/Makefile1
-rw-r--r--pjmedia/build/os-auto.mak.in6
2 files changed, 6 insertions, 1 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index dae6d61b..49cd9424 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -1,7 +1,6 @@
include ../../build.mak
THIRD_PARTY:=$(PJDIR)/third_party
-PA_DIR := $(THIRD_PARTY)/build/portaudio/src
SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \
$(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 5b80ea2d..a7a153e7 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -86,7 +86,13 @@ endif
# PortAudio
#
ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),)
+ifeq (x@ac_pa_path@,x)
+# Our PA in third_party
export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
+else
+# External PA
+export CFLAGS += -I@ac_pa_path@/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
+endif
endif
#