Changeset 1201
- Timestamp:
- Apr 17, 2007 4:16:01 PM (18 years ago)
- Location:
- pjproject/branches/split-3rd-party
- Files:
-
- 3 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/split-3rd-party/aconfigure
r1182 r1201 860 860 --disable-small-filter Exclude small filter in resampling 861 861 --disable-large-filter Exclude large filter in resampling 862 --disable-g711-plc Exclude G.711 Annex A PLC863 862 --disable-speex-aec Exclude Speex Acoustic Echo Canceller/AEC 864 863 --disable-g711-codec Exclude G.711 codecs from the build … … 1441 1440 ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h" 1442 1441 1443 ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.makthird_party/build/portaudio/Makefile"1442 ac_config_files="$ac_config_files build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/Makefile third_party/build/portaudio/Makefile" 1444 1443 1445 1444 … … 9015 9014 fi; 9016 9015 9017 9018 # Check whether --enable-g711-plc or --disable-g711-plc was given. 9019 if test "${enable_g711_plc+set}" = set; then 9020 enableval="$enable_g711_plc" 9021 if test "$enable_g711_plc" = "no"; then 9022 ac_no_g711_plc='-DPJMEDIA_HAS_G711_PLC=0' 9023 echo "$as_me:$LINENO: result: Checking if G.711 Annex A PLC is disabled...yes" >&5 9024 echo "${ECHO_T}Checking if G.711 Annex A PLC is disabled...yes" >&6 9025 fi 9026 else 9027 echo "$as_me:$LINENO: result: Checking if G.711 Annex A PLC is disabled...no" >&5 9028 echo "${ECHO_T}Checking if G.711 Annex A PLC is disabled...no" >&6 9029 fi; 9016 ac_no_g711_plc=yes 9017 9030 9018 9031 9019 … … 10094 10082 "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;; 10095 10083 "pjsip/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;; 10084 "third_party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/Makefile" ;; 10096 10085 "third_party/build/portaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/Makefile" ;; 10097 10086 "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;; -
pjproject/branches/split-3rd-party/aconfigure.ac
r1182 r1201 18 18 pjmedia/build/os-auto.mak 19 19 pjsip/build/os-auto.mak 20 third_party/Makefile 20 21 third_party/build/portaudio/Makefile 21 22 ]) … … 318 319 fi], 319 320 AC_MSG_RESULT([Checking if large filter is disabled... no])) 320 321 dnl # Include G.711 Annex A PLC322 AC_SUBST(ac_no_g711_plc)323 AC_ARG_ENABLE(g711-plc,324 AC_HELP_STRING([--disable-g711-plc],325 [Exclude G.711 Annex A PLC]),326 [if test "$enable_g711_plc" = "no"; then327 [ac_no_g711_plc='-DPJMEDIA_HAS_G711_PLC=0']328 AC_MSG_RESULT([Checking if G.711 Annex A PLC is disabled...yes])329 fi],330 AC_MSG_RESULT([Checking if G.711 Annex A PLC is disabled...no]))331 321 332 322 dnl # Include Speex AEC -
pjproject/branches/split-3rd-party/build.mak.in
r1055 r1201 8 8 export LINUX_POLL := @ac_linux_poll@ 9 9 10 # Application can use this 10 # Determine which party libraries to use 11 export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) 12 13 ifneq (@ac_no_gsm_codec@,1) 14 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) 15 endif 16 17 ifneq (@ac_no_speex_codec@,1) 18 APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) 19 endif 20 21 ifneq (@ac_no_ilbc_codec@,1) 22 APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) 23 endif 24 25 ifneq ($(findstring pa,@ac_pjmedia_snd@),) 26 APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) 27 endif 28 29 30 # CFLAGS, LDFLAGS, and LIBS to be used by applications 11 31 export PJDIR := @ac_pjdir@ 12 32 export APP_CC := $(CROSS_COMPILE)$(CC_NAME) … … 15 35 -I$(PJDIR)/pjlib/include\ 16 36 -I$(PJDIR)/pjlib-util/include\ 37 -I$(PJDIR)/pjnath/include\ 17 38 -I$(PJDIR)/pjmedia/include\ 18 39 -I$(PJDIR)/pjsip/include … … 20 41 export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\ 21 42 -L$(PJDIR)/pjlib-util/lib\ 43 -L$(PJDIR)/pjnath/lib\ 22 44 -L$(PJDIR)/pjmedia/lib\ 23 45 -L$(PJDIR)/pjsip/lib\ 46 -L$(PJDIR)/third_party/lib\ 24 47 @LDFLAGS@ 25 48 export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\ … … 29 52 -lpjmedia-codec-$(TARGET_NAME)\ 30 53 -lpjmedia-$(TARGET_NAME)\ 31 -lpj media-codec-$(TARGET_NAME)\54 -lpjnath-$(TARGET_NAME)\ 32 55 -lpjlib-util-$(TARGET_NAME)\ 56 $(APP_THIRD_PARTY_LIBS)\ 33 57 -lpj-$(TARGET_NAME)\ 34 58 @LIBS@ 35 59 60 export PJ_DIR := $(PJDIR) 61 export PJ_CC := $(APP_CC) 62 export PJ_CFLAGS := $(APP_CFLAGS) 63 export PJ_CXXFLAGS := $(APP_CXXFLAGS) 64 export PJ_LDFLAGS := $(APP_LDFLAGS) 65 export PJ_LDLIBS := $(APP_LDLIBS) 66 -
pjproject/branches/split-3rd-party/pjmedia/build/Makefile
r1182 r1201 2 2 include $(PJDIR)/build/common.mak 3 3 4 THIRD_PARTY:=../../third_party 4 5 RULES_MAK := $(PJDIR)/build/rules.mak 5 6 … … 22 23 $(CC_INC)../../pjlib-util/include \ 23 24 $(CC_INC)../../pjnath/include \ 24 $(CC_INC)../ src/pjmedia/portaudio25 $(CC_INC)../.. 25 26 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 26 27 $(HOST_CXXFLAGS) $(CXXFLAGS) … … 41 42 echo_suppress.o endpoint.o errno.o \ 42 43 g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ 43 mp3_writer.o null_port.o plc_common.o plc_steveu.o \44 port.o splitcomb.oresample.o \44 null_port.o plc_common.o port.o splitcomb.o \ 45 resample_resample.o \ 45 46 resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \ 46 47 session.o silencedet.o sound_port.o stream.o \ … … 67 68 # Defines for building PJMEDIA-Codec library 68 69 # 69 GSM_OBJS := gsm.o \70 gsm/add.o gsm/code.o gsm/decode.o \71 gsm/gsm_create.o gsm/gsm_decode.o gsm/gsm_destroy.o \72 gsm/gsm_encode.o gsm/gsm_explode.o gsm/gsm_implode.o \73 gsm/gsm_option.o gsm/long_term.o \74 gsm/lpc.o gsm/preprocess.o gsm/rpe.o gsm/short_term.o \75 gsm/table.o76 GSM_CFLAGS :=77 78 SPEEX_OBJS := speex_codec.o \79 speex/bits.o speex/cb_search.o speex/exc_10_16_table.o \80 speex/exc_10_32_table.o speex/exc_20_32_table.o \81 speex/exc_5_256_table.o speex/exc_5_64_table.o \82 speex/exc_8_128_table.o speex/fftwrap.o speex/filterbank.o \83 speex/filters.o speex/gain_table.o speex/gain_table_lbr.o \84 speex/hexc_10_32_table.o speex/hexc_table.o \85 speex/high_lsp_tables.o speex/jitter.o \86 speex/kiss_fft.o speex/kiss_fftr.o speex/lpc_spx.o \87 speex/lsp.o speex/lsp_tables_nb.o speex/ltp.o \88 speex/math_approx.o speex/misc.o speex/mdf.o speex/modes.o \89 speex/nb_celp.o speex/preprocess_spx.o \90 speex/quant_lsp.o speex/sb_celp.o speex/smallft.o \91 speex/speex.o speex/speex_callbacks.o speex/speex_header.o \92 speex/stereo.o speex/vbr.o speex/vq.o speex/window.o93 SPEEX_CFLAGS := -DHAVE_CONFIG_H=1 -I../src/pjmedia-codec94 95 ILBC_OBJS := ilbc.o \96 ilbc/FrameClassify.o ilbc/LPCdecode.o ilbc/LPCencode.o \97 ilbc/StateConstructW.o ilbc/StateSearchW.o ilbc/anaFilter.o \98 ilbc/constants.o ilbc/createCB.o ilbc/doCPLC.o \99 ilbc/enhancer.o ilbc/filter.o ilbc/gainquant.o \100 ilbc/getCBvec.o ilbc/helpfun.o ilbc/hpInput.o \101 ilbc/hpOutput.o ilbc/iCBConstruct.o ilbc/iCBSearch.o \102 ilbc/iLBC_decode.o ilbc/iLBC_encode.o ilbc/lsf.o \103 ilbc/packing.o ilbc/syntFilter.o104 ILBC_CFLAGS :=105 106 70 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec 107 71 export PJMEDIA_CODEC_OBJS += \ -
pjproject/branches/split-3rd-party/pjmedia/build/os-auto.mak.in
r770 r1201 2 2 3 3 # PJMEDIA features exclusion 4 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_ g711_plc@ @ac_no_speex_aec@4 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ 5 5 6 6 # Define the desired sound device backend … … 45 45 export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 46 46 else 47 export CODEC_OBJS += $(GSM_OBJS)47 export CODEC_OBJS += gsm.o 48 48 endif 49 49 … … 51 51 export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 52 52 else 53 export CODEC_OBJS += $(SPEEX_OBJS) 53 export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include 54 export CODEC_OBJS += speex_codec.o 54 55 endif 55 56 … … 57 58 export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 58 59 else 59 export CODEC_OBJS += $(ILBC_OBJS)60 export CODEC_OBJS += ilbc.o 60 61 endif 61 62 62 63 63 64 # 64 # PortAudio on Unix65 # PortAudio 65 66 # 66 ifeq ($(AC_PJMEDIA_SND),pa_unix) 67 # Host APIs and utils 68 export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_hostapis.o $(PA_DIR)/pa_unix_util.o 69 70 # Include ALSA? 71 ifeq ($(AC_PA_USE_ALSA),1) 72 export CFLAGS += -DPA_USE_ALSA=1 73 export PJMEDIA_OBJS += $(PA_DIR)/pa_linux_alsa.o 74 endif 75 76 export CFLAGS += -DPA_USE_OSS=1 \ 77 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 78 export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_oss.o 79 endif 80 81 82 # 83 # PortAudio on MacOS X (using current PortAudio) 84 # 85 ifeq ($(AC_PJMEDIA_SND),pa_darwinos) 86 export PJMEDIA_OBJS += $(PA_DIR)/pa_mac_hostapis.o \ 87 $(PA_DIR)/pa_unix_util.o \ 88 $(PA_DIR)/pa_mac_core.o \ 89 $(PA_DIR)/pa_mac_core_blocking.o \ 90 $(PA_DIR)/pa_mac_core_utilities.o \ 91 $(PA_DIR)/ringbuffer.o 92 export CFLAGS += -DPA_USE_COREAUDIO=1 \ 93 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 94 export CFLAGS += @ac_pa_cflags@ 95 endif 96 97 # 98 # PortAudio on MacOS X (using old PortAudio, for MacOS X 10.2.x) 99 # 100 ifeq ($(AC_PJMEDIA_SND),pa_old_darwinos) 101 export PJMEDIA_OBJS += $(PA_DIR)/pa_mac_hostapis.o \ 102 $(PA_DIR)/pa_unix_util.o \ 103 $(PA_DIR)/pa_mac_core_old.o 104 export CFLAGS += -DPA_USE_COREAUDIO=1 \ 105 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 106 export CFLAGS += @ac_pa_cflags@ 107 endif 108 109 # 110 # 111 # PortAudio on Win32 (WMME) 112 # 113 ifeq ($(AC_PJMEDIA_SND),pa_win32) 114 export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ 115 $(PA_DIR)/pa_win_wmme.o 116 export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS \ 117 -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 67 ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 68 export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 69 export SOUND_OBJS = pasound.o 118 70 endif 119 71 -
pjproject/branches/split-3rd-party/pjnath/build/Makefile
r1111 r1201 3 3 export PJNATH_TEST_OBJS = main.o 4 4 5 include ../../build/common.mak 5 include ../../build.mak 6 include $(PJDIR)/build/common.mak 6 7 7 RULES_MAK := ../../build/rules.mak8 RULES_MAK := $(PJDIR)/build/rules.mak 8 9 9 10 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) … … 66 67 $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB) 67 68 68 pjnath-test: $(PJLIB_LIB) 69 pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) 69 70 $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE) 70 71 -
pjproject/branches/split-3rd-party/pjsip-apps/build/Makefile
r1111 r1201 1 include ../../build/common.mak 1 include ../../build.mak 2 include $(PJDIR)/build/common.mak 2 3 3 RULES_MAK := ../../build/rules.mak 4 5 RULES_MAK := $(PJDIR)/build/rules.mak 4 6 5 7 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) … … 25 27 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 26 28 $(HOST_CXXFLAGS) $(CXXFLAGS) 27 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \28 $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \29 $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \30 $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \31 $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \32 $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \33 $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \34 $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \35 $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \36 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \37 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \38 $(LDFLAGS) -lm39 40 29 41 30 ############################################################################### … … 46 35 main.o pjsua_app.o 47 36 export PJSUA_CFLAGS += $(_CFLAGS) 48 export PJSUA_LDFLAGS += $( _LDFLAGS)37 export PJSUA_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) 49 38 export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) 50 39 -
pjproject/branches/split-3rd-party/pjsip-apps/build/Samples.mak
r1127 r1201 1 1 2 2 include ../../build/common.mak 3 4 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)5 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)6 PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)7 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT)8 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT)9 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT)10 PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT)11 PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT)12 PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT)13 3 14 4 … … 16 6 # Gather all flags. 17 7 # 18 export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ 19 $(CFLAGS) $(CC_INC)../../pjsip/include \ 20 $(CC_INC)../../pjlib/include \ 21 $(CC_INC)../../pjlib-util/include \ 22 $(CC_INC)../../pjnath/include \ 23 $(CC_INC)../../pjmedia/include 24 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 25 $(HOST_CXXFLAGS) $(CXXFLAGS) 26 27 export LIBS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \ 28 $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \ 29 $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \ 30 $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \ 31 $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 32 $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ 33 $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 34 $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ 35 $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ 36 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) 37 38 39 export _LDFLAGS := $(LIBS) \ 40 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 41 $(LDFLAGS) -lm 8 export _CFLAGS := $(PJ_CFLAGS) 9 export _CXXFLAGS:= $(PJ_CXXFLAGS) 10 export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) 42 11 43 12 SRCDIR := ../src/samples -
pjproject/branches/split-3rd-party/pjsip/build/Makefile
r1111 r1201 4 4 export TEST_OBJS = main.o 5 5 6 include ../../build/common.mak 6 include ../../build.mak 7 include $(PJDIR)/build/common.mak 7 8 8 RULES_MAK := ../../build/rules.mak9 RULES_MAK := $(PJDIR)/build/rules.mak 9 10 10 11 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) … … 30 31 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 31 32 $(HOST_CXXFLAGS) $(CXXFLAGS) 32 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \33 $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \34 $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \35 $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \36 $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \37 $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \38 $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \39 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \40 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \41 $(LDFLAGS)42 43 33 44 34 ############################################################################### … … 100 90 tsx_uas_test.o txdata_test.o uri_test.o 101 91 export TEST_CFLAGS += $(_CFLAGS) 102 export TEST_LDFLAGS += $( _LDFLAGS)92 export TEST_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) 103 93 export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) 104 94
Note: See TracChangeset
for help on using the changeset viewer.