diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-01-14 14:46:54 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-01-14 14:46:54 +0000 |
| commit | a9012f70f62c58f2311c8d69729d36947daa0ab2 (patch) | |
| tree | f33c6d5174669ab3956953bd2cb37010dd1bd70f /pjmedia | |
| parent | 0c93ac9d11ec67e86b2b5c8a9c2181cee8b5e391 (diff) | |
More #1025 (support for using external third party libraries):
- support for using external libspeex and libgsm
- replaced --with-pa-path with --with-external-pa
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3062 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 8 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia-codec/config_auto.h.in | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index a7a153e7..a1a4050d 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in @@ -86,12 +86,12 @@ endif # PortAudio # ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) -ifeq (x@ac_pa_path@,x) +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 -else -# External PA -export CFLAGS += -I@ac_pa_path@/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 endif endif diff --git a/pjmedia/include/pjmedia-codec/config_auto.h.in b/pjmedia/include/pjmedia-codec/config_auto.h.in index 69b56286..19264270 100644 --- a/pjmedia/include/pjmedia-codec/config_auto.h.in +++ b/pjmedia/include/pjmedia-codec/config_auto.h.in @@ -42,12 +42,14 @@ #undef PJMEDIA_HAS_GSM_CODEC #endif +#undef PJMEDIA_EXTERNAL_GSM_CODEC /* Speex codec */ #ifndef PJMEDIA_HAS_SPEEX_CODEC #undef PJMEDIA_HAS_SPEEX_CODEC #endif +#undef PJMEDIA_EXTERNAL_SPEEX_CODEC /* iLBC codec */ #ifndef PJMEDIA_HAS_ILBC_CODEC diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index 965c936d..11252137 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -28,13 +28,18 @@ #include <pj/pool.h> #include <pj/string.h> #include <pj/os.h> -#include "../../third_party/gsm/inc/gsm.h" /* * Only build this file if PJMEDIA_HAS_GSM_CODEC != 0 */ #if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0 +#if defined(PJMEDIA_EXTERNAL_GSM_CODEC) && PJMEDIA_EXTERNAL_GSM_CODEC +# include <gsm/gsm.h> +#else +# include "../../third_party/gsm/inc/gsm.h" +#endif + /* We removed PLC in 0.6 (and re-enabled it again in 0.9!) */ #define PLC_DISABLED 0 |