diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2016-03-23 07:52:41 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2016-03-23 07:52:41 +0000 |
| commit | 58a508b7679a9ace99529d77216a76b5913aace1 (patch) | |
| tree | b194ef9d66d77138b7eebbef98ccc45122d4287c /pjmedia | |
| parent | 08e8b8225bbc6343053c242fe34e96eb7375dfcc (diff) | |
Close #1906: Removed PortAudio from PJSIP source package.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5268 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 7 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-audiodev/config.h | 11 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index a3e84954..e60cc8b1 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -191,16 +191,9 @@ endif # # PortAudio # -ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) ifeq (@ac_external_pa@,1) # External PA export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 -else -# Our PA in third_party -export CFLAGS += -I$(THIRD_PARTY)/build/portaudio \ - -I$(THIRD_PARTY)/portaudio/include \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 -endif endif # diff --git a/pjmedia/include/pjmedia-audiodev/config.h b/pjmedia/include/pjmedia-audiodev/config.h index b55aed44..7a512fc8 100644 --- a/pjmedia/include/pjmedia-audiodev/config.h +++ b/pjmedia/include/pjmedia-audiodev/config.h @@ -59,17 +59,10 @@ PJ_BEGIN_DECL /** * This setting controls whether PortAudio support should be included. * - * By default it is enabled except on Windows platforms (including - * Windows Mobile) and Symbian. + * By default it is disabled. */ #ifndef PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO -# if (defined(PJ_WIN32) && PJ_WIN32!=0) || \ - (defined(PJ_WIN64) && PJ_WIN64!=0) || \ - (defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0) -# define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 0 -# else -# define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 1 -# endif +# define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 0 #endif /** |