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 /build.mak.in | |
| 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 'build.mak.in')
| -rw-r--r-- | build.mak.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/build.mak.in b/build.mak.in index 1d500074..c0c60805 100644 --- a/build.mak.in +++ b/build.mak.in @@ -14,14 +14,25 @@ export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAM export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) ifneq (@ac_no_gsm_codec@,1) +ifeq (@ac_external_gsm@,1) +# External GSM library +APP_THIRD_PARTY_LIBS += -lgsm +APP_THIRD_PARTY_LIB_FILES += +else APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) endif +endif ifneq (@ac_no_speex_codec@,1) +ifeq (@ac_external_speex@,1) +APP_THIRD_PARTY_LIBS += -lspeex -lspeexdsp +APP_THIRD_PARTY_LIB_FILES += +else APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) endif +endif ifneq (@ac_no_ilbc_codec@,1) APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) @@ -33,12 +44,11 @@ APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX) endif -ifneq (x@ac_pa_path@,x) -# We're using external PortAudio -APP_THIRD_PARTY_LIBS += -L@ac_pa_path@/lib -lportaudio +ifneq ($(findstring pa,@ac_pjmedia_snd@),) +ifeq (@ac_external_pa@,1) +APP_THIRD_PARTY_LIBS += -lportaudio APP_THIRD_PARTY_LIB_FILES += else -ifneq ($(findstring pa,@ac_pjmedia_snd@),) APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) endif |