diff options
Diffstat (limited to 'pjmedia/build')
| -rw-r--r-- | pjmedia/build/Makefile | 1 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 6 |
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 # |