Compare commits
2 Commits
08578e86ee
...
ab1be367de
Author | SHA1 | Date |
---|---|---|
Pau Espin | ab1be367de | |
Pau Espin | 8a766a7b04 |
|
@ -9164,7 +9164,11 @@ else $as_nop
|
||||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||||
LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
if test -d $with_ssl/lib; then
|
||||||
|
LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||||
|
else
|
||||||
|
LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||||
|
fi
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
||||||
printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
|
printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1947,7 +1947,11 @@ AC_ARG_ENABLE(ssl,
|
||||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||||
LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
if test -d $with_ssl/lib; then
|
||||||
|
LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||||
|
else
|
||||||
|
LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||||
|
fi
|
||||||
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
112
build.mak.in
112
build.mak.in
|
@ -1,4 +1,3 @@
|
||||||
export PJDIR := @ac_pjdir@
|
|
||||||
include $(PJDIR)/version.mak
|
include $(PJDIR)/version.mak
|
||||||
export PJ_DIR := $(PJDIR)
|
export PJ_DIR := $(PJDIR)
|
||||||
|
|
||||||
|
@ -42,21 +41,6 @@ export APP_THIRD_PARTY_EXT :=
|
||||||
export APP_THIRD_PARTY_LIBS :=
|
export APP_THIRD_PARTY_LIBS :=
|
||||||
export APP_THIRD_PARTY_LIB_FILES :=
|
export APP_THIRD_PARTY_LIB_FILES :=
|
||||||
|
|
||||||
ifneq (@ac_no_srtp@,1)
|
|
||||||
ifneq (@ac_external_srtp@,0)
|
|
||||||
# External SRTP library
|
|
||||||
APP_THIRD_PARTY_EXT += -l@ac_external_srtp_lib@
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lsrtp-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lsrtp
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (@ac_pjmedia_resample@,libresample)
|
ifeq (@ac_pjmedia_resample@,libresample)
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
|
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
ifeq ($(PJ_SHARED_LIBRARIES),)
|
||||||
|
@ -73,102 +57,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (@ac_no_gsm_codec@,1)
|
|
||||||
ifeq (@ac_external_gsm@,1)
|
|
||||||
# External GSM library
|
|
||||||
APP_THIRD_PARTY_EXT += -lgsm
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lgsmcodec
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_speex_codec@,1)
|
|
||||||
ifeq (@ac_external_speex@,1)
|
|
||||||
APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lspeex
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_ilbc_codec@,1)
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lilbccodec
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_g7221_codec@,1)
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lg7221codec
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (@ac_external_pa@,1)
|
|
||||||
# External PA
|
|
||||||
APP_THIRD_PARTY_EXT += -lportaudio
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_yuv@,1)
|
|
||||||
ifeq (@ac_external_yuv@,1)
|
|
||||||
APP_THIRD_PARTY_EXT += -lyuv
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lyuv-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lyuv
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_webrtc@,1)
|
|
||||||
ifeq (@ac_external_webrtc@,1)
|
|
||||||
APP_THIRD_PARTY_EXT += -lwebrtc
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lwebrtc-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lwebrtc
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (@ac_no_webrtc_aec3@,1)
|
|
||||||
ifeq (@ac_external_webrtc_aec3@,1)
|
|
||||||
APP_THIRD_PARTY_EXT += -lwebrtc-aec3
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX)
|
|
||||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
||||||
APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME)
|
|
||||||
else
|
|
||||||
APP_THIRD_PARTY_LIBS += -lwebrtc-aec3
|
|
||||||
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
# Additional flags
|
# Additional flags
|
||||||
@ac_build_mak_vars@
|
@ac_build_mak_vars@
|
||||||
|
|
Loading…
Reference in New Issue