Changeset 3062 for pjproject/trunk/build.mak.in

Timestamp:

Jan 14, 2010 2:46:54 PM (14 years ago)

Author:

bennylp

Message:

More #1025 (support for using external third party libraries):

• support for using external libspeex and libgsm
• replaced --with-pa-path with --with-external-pa

File:

• pjproject/trunk/build.mak.in (modified) (2 diffs)

pjproject/trunk/build.mak.in

@@ -15 +15 @@
 
 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
 
@@ -34 +45 @@
 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)