Changeset 1202


Ignore:
Timestamp:
Apr 18, 2007 9:24:31 AM (12 years ago)
Author:
bennylp
Message:

Fixed the legacy build system

Location:
pjproject/branches/split-3rd-party
Files:
6 added
1 deleted
15 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed
  • pjproject/branches/split-3rd-party/Makefile

    r1112 r1202  
    22include build/host-$(HOST_NAME).mak 
    33 
    4 DIRS = pjlib pjlib-util pjnath pjmedia pjsip pjsip-apps 
     4DIRS = pjlib pjlib-util pjnath third_party pjmedia pjsip pjsip-apps 
    55 
    66ifdef MINSIZE 
     
    1010all clean dep depend distclean doc print realclean: 
    1111        for dir in $(DIRS); do \ 
    12            if [ -d $$dir ]; then \ 
    1312                if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \ 
    1413                    true; \ 
     
    1615                    exit 1; \ 
    1716                fi; \ 
    18            fi; \ 
    1917        done 
    2018 
  • pjproject/branches/split-3rd-party/aconfigure

    r1201 r1202  
    309309#endif" 
    310310 
    311 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX ac_pjdir CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_no_small_filter ac_no_large_filter ac_no_g711_plc ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS' 
     311ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX ac_pjdir CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_no_small_filter ac_no_large_filter ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS' 
    312312ac_subst_files='' 
    313313 
     
    14401440                                                  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" 
    14411441 
    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" 
     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/build/portaudio/os-auto.mak third_party/build/os-auto.mak" 
    14431443 
    14441444 
     
    90139013echo "${ECHO_T}Checking if large filter is disabled... no" >&6 
    90149014fi; 
    9015  
    9016 ac_no_g711_plc=yes 
    9017  
    90189015 
    90199016 
     
    1008210079  "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;; 
    1008310080  "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" ;; 
    10085   "third_party/build/portaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/Makefile" ;; 
     10081  "third_party/build/portaudio/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
     10082  "third_party/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;; 
    1008610083  "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;; 
    1008710084  "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;; 
     
    1020410201s,@ac_no_small_filter@,$ac_no_small_filter,;t t 
    1020510202s,@ac_no_large_filter@,$ac_no_large_filter,;t t 
    10206 s,@ac_no_g711_plc@,$ac_no_g711_plc,;t t 
    1020710203s,@ac_no_speex_aec@,$ac_no_speex_aec,;t t 
    1020810204s,@ac_no_g711_codec@,$ac_no_g711_codec,;t t 
     
    1070810704 
    1070910705 
     10706 
     10707echo "$as_me:$LINENO: result: 
     10708 
     10709The configuration for current target has been written to 'build.mak', and 'os-auto.mak' in various build directories. 
     10710 
     10711Customizations can be put in: 
     10712  - 'user.mak' 
     10713  - 'pjlib/include/pj/config_site.h' 
     10714 
     10715The next step now is to run 'make dep' and 'make'. 
     10716" >&5 
     10717echo "${ECHO_T} 
     10718 
     10719The configuration for current target has been written to 'build.mak', and 'os-auto.mak' in various build directories. 
     10720 
     10721Customizations can be put in: 
     10722  - 'user.mak' 
     10723  - 'pjlib/include/pj/config_site.h' 
     10724 
     10725The next step now is to run 'make dep' and 'make'. 
     10726" >&6 
     10727 
  • pjproject/branches/split-3rd-party/aconfigure.ac

    r1201 r1202  
    1818                 pjmedia/build/os-auto.mak 
    1919                 pjsip/build/os-auto.mak 
    20                  third_party/Makefile 
    21                  third_party/build/portaudio/Makefile 
     20                 third_party/build/portaudio/os-auto.mak  
     21                 third_party/build/os-auto.mak 
    2222                ]) 
    2323 
     
    518518AC_OUTPUT() 
    519519 
     520 
     521AC_MSG_RESULT([ 
     522 
     523The configuration for current target has been written to 'build.mak', and 'os-auto.mak' in various build directories. 
     524 
     525Customizations can be put in: 
     526  - 'user.mak' 
     527  - 'pjlib/include/pj/config_site.h' 
     528 
     529The next step now is to run 'make dep' and 'make'. 
     530]) 
     531 
  • pjproject/branches/split-3rd-party/build/os-linux.mak

    r689 r1202  
    33export OS_CXXFLAGS :=  
    44 
    5 export OS_LDFLAGS  := $(CC_LIB)pthread$(LIBEXT2) -lm 
     5export OS_LDFLAGS  := -lportaudio-$(TARGET_NAME) -lgsmcodec-$(TARGET_NAME) -lilbccodec-$(TARGET_NAME) -lspeex-$(TARGET_NAME) -lresample-$(TARGET_NAME) $(CC_LIB)pthread$(LIBEXT2) -lm 
    66 
    77export OS_SOURCES  :=  
  • pjproject/branches/split-3rd-party/configure-legacy

    r795 r1202  
    11#!/bin/sh 
     2 
     3PJDIR=`pwd` 
    24 
    35# 
     
    9294fi 
    9395 
    94 echo 'Writing build.mak as follows:' 
    95 echo " MACHINE_NAME = $MACHINE_NAME" 
    96 echo " OS_NAME      = $OS_NAME" 
    97 echo " HOST_NAME    = $HOST_NAME" 
    98 echo " CC_NAME      = $CC_NAME" 
    99 echo " TARGET_NAME  = $TARGET_NAME" 
    100 echo " CROSS_COMPILE= $CROSS_COMPILE" 
    101 echo " LINUX_POLL   = $LINUX_POLL" 
     96echo 'build.mak configurations are set as follows:' 
     97echo " PJDIR         = $PJDIR" 
     98echo " MACHINE_NAME  = $MACHINE_NAME" 
     99echo " OS_NAME       = $OS_NAME" 
     100echo " HOST_NAME     = $HOST_NAME" 
     101echo " CC_NAME       = $CC_NAME" 
     102echo " TARGET_NAME   = $TARGET_NAME" 
     103echo " CROSS_COMPILE = $CROSS_COMPILE" 
     104echo " LINUX_POLL    = $LINUX_POLL" 
    102105 
    103106echo "# Auto-generated build.mak" > build.mak 
     107echo "export PJDIR := $PJDIR" >> build.mak 
    104108echo "export MACHINE_NAME := $MACHINE_NAME" >> build.mak 
    105109echo "export OS_NAME := $OS_NAME" >> build.mak 
     
    110114echo "export LINUX_POLL := $LINUX_POLL" >> build.mak 
    111115 
     116echo >> build.mak 
     117 
     118cat << EOF >> build.mak 
     119export APP_CC = \$(CROSS_COMPILE)\$(CC_NAME) 
     120 
     121export APP_CFLAGS = \$(CC_CFLAGS) \$(OS_CFLAGS) \$(HOST_CFLAGS) \$(M_CFLAGS) \$(CFLAGS) -I\$(PJDIR)/pjlib/include -I\$(PJDIR)/pjlib-util/include -I\$(PJDIR)/pjnath/include -I\$(PJDIR)/pjmedia/include -I\$(PJDIR)/pjsip/include 
     122 
     123export APP_CXXFLAGS = \$(APP_CFLAGS) 
     124 
     125export APP_LDFLAGS = -L\$(PJDIR)/pjlib/lib -L\$(PJDIR)/pjlib-util/lib -L\$(PJDIR)/pjnath/lib -L\$(PJDIR)/pjmedia/lib -L\$(PJDIR)/pjsip/lib -L\$(PJDIR)/third_party/lib  
     126 
     127export APP_LDLIBS = -lpjsua-\$(TARGET_NAME) -lpjsip-ua-\$(TARGET_NAME) -lpjsip-simple-\$(TARGET_NAME) -lpjsip-\$(TARGET_NAME) -lpjmedia-codec-\$(TARGET_NAME) -lpjmedia-\$(TARGET_NAME) -lpjnath-\$(TARGET_NAME) -lpjlib-util-\$(TARGET_NAME) \$(APP_THIRD_PARTY_LIBS) -lpj-\$(TARGET_NAME) \$(CC_LDFLAGS) \$(OS_LDFLAGS) \$(M_LDFLAGS) \$(HOST_LDFLAGS) \$(LDFLAGS) 
     128 
     129export PJ_DIR = \$(PJDIR) 
     130export PJ_CC = \$(APP_CC) 
     131export PJ_CFLAGS = \$(APP_CFLAGS) 
     132export PJ_CXXFLAGS = \$(APP_CXXFLAGS) 
     133export PJ_LDFLAGS = \$(APP_LDFLAGS) 
     134export PJ_LDLIBS = \$(APP_LDLIBS) 
     135 
     136EOF 
     137 
    112138touch user.mak 
     139 
    113140 
    114141echo 
  • pjproject/branches/split-3rd-party/pjmedia/build/Makefile

    r1201 r1202  
    11include ../../build.mak 
     2 
     3THIRD_PARTY:=$(PJDIR)/third_party 
     4PA_DIR := $(THIRD_PARTY)/build/portaudio/src 
     5 
    26include $(PJDIR)/build/common.mak 
    37 
    4 THIRD_PARTY:=../../third_party 
    58RULES_MAK := $(PJDIR)/build/rules.mak 
    69 
     
    3942export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    4043                        alaw_ulaw.o alaw_ulaw_table.o clock_thread.o codec.o \ 
    41                         conference.o echo_common.o echo_port.o echo_speex.o \ 
     44                        conference.o echo_common.o echo_port.o \ 
    4245                        echo_suppress.o endpoint.o errno.o \ 
    4346                        g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ 
  • pjproject/branches/split-3rd-party/pjmedia/build/os-auto.mak.in

    r1201 r1202  
    5353export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include 
    5454export CODEC_OBJS += speex_codec.o 
     55 
     56ifneq (@ac_no_speex_aec@,1) 
     57export PJMEDIA_OBJS += echo_speex.o 
     58endif 
     59 
    5560endif 
    5661 
  • pjproject/branches/split-3rd-party/pjmedia/build/os-darwinos.mak

    r353 r1202  
    1 # 
    2 # OS specific configuration for Darwin/MacOS target.  
    3 # 
     1 
     2# PJMEDIA features exclusion 
     3export CFLAGS +=  
     4 
     5# Define the desired sound device backend 
     6# Valid values are: 
     7#   - pa_unix:          PortAudio on Unix (OSS or ALSA) 
     8#   - pa_darwinos:      PortAudio on MacOSX (CoreAudio) 
     9#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2) 
     10#   - pa_win32:         PortAudio on Win32 (WMME) 
     11#   - ds:               Win32 DirectSound (dsound.c) 
     12#   - null:             Null sound device (nullsound.c) 
     13AC_PJMEDIA_SND=pa_old_darwinos 
     14 
     15# For Unix, specify if ALSA should be supported 
     16AC_PA_USE_ALSA=0 
    417 
    518# 
    6 # PJMEDIA_OBJS specified here are object files to be included in PJMEDIA 
    7 # (the library) for this specific operating system. Object files common  
    8 # to all operating systems should go in Makefile instead. 
     19# Codecs 
    920# 
    10 export PJMEDIA_OBJS += $(PA_DIR)/pa_mac_hostapis.o \ 
    11                        $(PA_DIR)/pa_unix_util.o \ 
    12                        $(PA_DIR)/pa_mac_core.o 
     21AC_NO_G711_CODEC=0 
     22AC_NO_L16_CODEC=0 
     23AC_NO_GSM_CODEC=0 
     24AC_NO_SPEEX_CODEC=0 
     25AC_NO_ILBC_CODEC=0 
    1326 
    14 #                      $(PA_DIR)/pa_mac_alt.o 
    15 #                      $(PA_DIR)/ringbuffer.o 
     27export CODEC_OBJS= 
    1628 
    17 export OS_CFLAGS +=  $(CC_DEF)PA_USE_COREAUDIO=1 $(CC_DEF)PA_BIG_ENDIAN=1 
     29ifeq ($(AC_NO_G711_CODEC),1) 
     30export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 
     31else 
     32export CODEC_OBJS += 
     33endif 
     34 
     35ifeq ($(AC_NO_L16_CODEC),1) 
     36export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0 
     37else 
     38export CODEC_OBJS += l16.o 
     39endif 
     40 
     41ifeq ($(AC_NO_GSM_CODEC),1) 
     42export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 
     43else 
     44export CODEC_OBJS += gsm.o 
     45endif 
     46 
     47ifeq ($(AC_NO_SPEEX_CODEC),1) 
     48export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 
     49else 
     50export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include 
     51export CODEC_OBJS += speex_codec.o 
     52 
     53#ifeq (@ac_no_speex_aec@,1) 
     54ifeq (0,1) 
     55export PJMEDIA_OBJS += echo_speex.o 
     56endif 
     57 
     58endif 
     59 
     60ifeq ($(AC_NO_ILBC_CODEC),1) 
     61export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 
     62else 
     63export CODEC_OBJS += ilbc.o 
     64endif 
     65 
     66 
     67# 
     68# PortAudio 
     69# 
     70ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 
     71export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 
     72export SOUND_OBJS = pasound.o 
     73endif 
     74 
     75# 
     76# Win32 DirectSound 
     77# 
     78ifeq ($(AC_PJMEDIA_SND),ds) 
     79export SOUND_OBJS = dsound.o 
     80export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND 
     81endif 
     82 
     83# 
     84# Last resort, null sound device 
     85# 
     86ifeq ($(AC_PJMEDIA_SND),null) 
     87export SOUND_OBJS = nullsound.o 
     88export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND 
     89endif 
     90 
     91 
  • pjproject/branches/split-3rd-party/pjmedia/build/os-linux.mak

    r341 r1202  
    1 # 
    2 # OS specific configuration for Linux OS target.  
    3 # 
     1# Linux 
     2 
     3# Define the desired sound device backend 
     4# Valid values are: 
     5#   - pa_unix:          PortAudio on Unix (OSS or ALSA) 
     6#   - pa_darwinos:      PortAudio on MacOSX (CoreAudio) 
     7#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2) 
     8#   - pa_win32:         PortAudio on Win32 (WMME) 
     9#   - ds:               Win32 DirectSound (dsound.c) 
     10#   - null:             Null sound device (nullsound.c) 
     11AC_PJMEDIA_SND=pa_unix 
    412 
    513# 
    6 # PJMEDIA_OBJS specified here are object files to be included in PJMEDIA 
    7 # (the library) for this specific operating system. Object files common  
    8 # to all operating systems should go in Makefile instead. 
     14# Codecs 
    915# 
    10 export PJMEDIA_OBJS += $(PA_DIR)/pa_unix_hostapis.o $(PA_DIR)/pa_unix_util.o \ 
    11                        $(PA_DIR)/pa_unix_oss.o 
    12 #                      $(PA_DIR)/pa_linux_alsa.o 
     16AC_NO_G711_CODEC=0 
     17AC_NO_L16_CODEC=0 
     18AC_NO_GSM_CODEC=0 
     19AC_NO_SPEEX_CODEC=0 
     20AC_NO_ILBC_CODEC=0 
    1321 
    14 export OS_CFLAGS +=  $(CC_DEF)PA_USE_OSS=1 
     22export CODEC_OBJS= 
     23 
     24ifeq ($(AC_NO_G711_CODEC),1) 
     25export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 
     26else 
     27export CODEC_OBJS += 
     28endif 
     29 
     30ifeq ($(AC_NO_L16_CODEC),1) 
     31export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0 
     32else 
     33export CODEC_OBJS += l16.o 
     34endif 
     35 
     36ifeq ($(AC_NO_GSM_CODEC),1) 
     37export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 
     38else 
     39export CODEC_OBJS += gsm.o 
     40endif 
     41 
     42ifeq ($(AC_NO_SPEEX_CODEC),1) 
     43export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 
     44else 
     45export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include 
     46export CODEC_OBJS += speex_codec.o 
     47 
     48ifeq (1,1) 
     49export PJMEDIA_OBJS += echo_speex.o 
     50endif 
     51 
     52endif 
     53 
     54ifeq ($(AC_NO_ILBC_CODEC),1) 
     55export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 
     56else 
     57export CODEC_OBJS += ilbc.o 
     58endif 
     59 
     60 
     61# 
     62# PortAudio 
     63# 
     64ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 
     65export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 
     66export SOUND_OBJS = pasound.o 
     67endif 
     68 
     69# 
     70# Win32 DirectSound 
     71# 
     72ifeq ($(AC_PJMEDIA_SND),ds) 
     73export SOUND_OBJS = dsound.o 
     74export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND 
     75endif 
     76 
     77# 
     78# Last resort, null sound device 
     79# 
     80ifeq ($(AC_PJMEDIA_SND),null) 
     81export SOUND_OBJS = nullsound.o 
     82export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND 
     83endif 
     84 
     85 
  • pjproject/branches/split-3rd-party/pjmedia/build/os-win32.mak

    r452 r1202  
    1 # 
    2 # OS specific configuration for Win32 OS target.  
    3 # 
     1# PJMEDIA features exclusion 
     2export CFLAGS +=  
     3 
     4# Define the desired sound device backend 
     5# Valid values are: 
     6#   - pa_unix:          PortAudio on Unix (OSS or ALSA) 
     7#   - pa_darwinos:      PortAudio on MacOSX (CoreAudio) 
     8#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2) 
     9#   - pa_win32:         PortAudio on Win32 (WMME) 
     10#   - ds:               Win32 DirectSound (dsound.c) 
     11#   - null:             Null sound device (nullsound.c) 
     12AC_PJMEDIA_SND=pa_win32 
    413 
    514# 
    6 # PJMEDIA_OBJS specified here are object files to be included in PJMEDIA 
    7 # (the library) for this specific operating system. Object files common  
    8 # to all operating systems should go in Makefile instead. 
     15# Codecs 
    916# 
    10 export PJMEDIA_OBJS += $(PA_DIR)/pa_win_hostapis.o $(PA_DIR)/pa_win_util.o \ 
    11                        $(PA_DIR)/pa_win_wmme.o 
     17AC_NO_G711_CODEC=0 
     18AC_NO_L16_CODEC=0 
     19AC_NO_GSM_CODEC=0 
     20AC_NO_SPEEX_CODEC=0 
     21AC_NO_ILBC_CODEC=0 
    1222 
    13 export OS_CFLAGS += -DPA_NO_ASIO -DPA_NO_DS \ 
    14                     -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 
     23export CODEC_OBJS= 
    1524 
    16 # Example: 
    17 #  to activate Null sound, uncomment these two lines below. 
    18 #export SOUND_OBJS = $(NULLSOUND_OBJS) 
    19 #export OS_CFLAGS += $(CC_DEF)PJMEDIA_HAS_NULL_SOUND 
     25ifeq ($(AC_NO_G711_CODEC),1) 
     26export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 
     27else 
     28export CODEC_OBJS += 
     29endif 
    2030 
    21 # Example: 
    22 #  to include only GSM and exclude Speex codec, uncomment the "export" line below. 
    23 #  Note that you'll need to put "#define PJMEDIA_HAS_SPEEX_CODEC 0" in 
    24 #  <pj/config_site.h> 
    25 #export CODEC_OBJS = $(GSM_OBJS) 
     31ifeq ($(AC_NO_L16_CODEC),1) 
     32export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0 
     33else 
     34export CODEC_OBJS += l16.o 
     35endif 
    2636 
     37ifeq ($(AC_NO_GSM_CODEC),1) 
     38export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 
     39else 
     40export CODEC_OBJS += gsm.o 
     41endif 
     42 
     43ifeq ($(AC_NO_SPEEX_CODEC),1) 
     44export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 
     45else 
     46export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include 
     47export CODEC_OBJS += speex_codec.o 
     48 
     49#ifeq (@ac_no_speex_aec@,1) 
     50ifeq (0,1) 
     51export PJMEDIA_OBJS += echo_speex.o 
     52endif 
     53 
     54endif 
     55 
     56ifeq ($(AC_NO_ILBC_CODEC),1) 
     57export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 
     58else 
     59export CODEC_OBJS += ilbc.o 
     60endif 
     61 
     62 
     63# 
     64# PortAudio 
     65# 
     66ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 
     67export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND 
     68export SOUND_OBJS = pasound.o 
     69endif 
     70 
     71# 
     72# Win32 DirectSound 
     73# 
     74ifeq ($(AC_PJMEDIA_SND),ds) 
     75export SOUND_OBJS = dsound.o 
     76export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND 
     77endif 
     78 
     79# 
     80# Last resort, null sound device 
     81# 
     82ifeq ($(AC_PJMEDIA_SND),null) 
     83export SOUND_OBJS = nullsound.o 
     84export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND 
     85endif 
     86 
     87 
  • pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/errno.c

    r974 r1202  
    2020#include <pjmedia/types.h> 
    2121#include <pj/string.h> 
    22 #include <portaudio.h> 
     22#if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_PORTAUDIO_SOUND 
     23#   include <portaudio.h> 
     24#endif 
    2325 
    2426 
  • pjproject/branches/split-3rd-party/pjmedia/src/pjmedia/sound_port.c

    r974 r1202  
    2626#include <pj/string.h>      /* pj_memset() */ 
    2727 
    28 #ifndef PJMEDIA_SOUND_HAS_AEC 
    29 #   define PJMEDIA_SOUND_HAS_AEC        1 
    30 #endif 
    31  
    32 #if defined(PJMEDIA_SOUND_HAS_AEC) && PJMEDIA_SOUND_HAS_AEC!=0 
    33 #   include <speex/speex_echo.h> 
    34 #endif 
    35  
    3628//#define SIMULATE_LOST_PCT   20 
    3729#define AEC_TAIL            128     /* default AEC length in ms */ 
  • pjproject/branches/split-3rd-party/pjsip/build/Makefile

    r1201 r1202  
    9090                    tsx_uas_test.o txdata_test.o uri_test.o 
    9191export TEST_CFLAGS += $(_CFLAGS) 
    92 export TEST_LDFLAGS += $(APP_LDFLAGS) $(APP_LDLIBS) 
     92export TEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) 
    9393export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) 
    9494 
  • pjproject/branches/split-3rd-party/third_party/build

    • Property svn:ignore set to
      os-auto.mak
  • pjproject/branches/split-3rd-party/third_party/build/Makefile

    r1201 r1202  
    1 include ../build.mak 
    2 include $(PJDIR)/build/host-$(HOST_NAME).mak 
    3  
    4 DIRS = build/resample 
    5  
    6 ifeq (@ac_no_gsm_codec@,1) 
    7 else 
    8 DIRS += build/gsm 
    9 endif 
    10  
    11 ifeq (@ac_no_ilbc_codec@,1) 
    12 else 
    13 DIRS += build/ilbc 
    14 endif 
    15  
    16 ifeq (@ac_no_speex_codec@,1) 
    17 else 
    18 DIRS += build/speex 
    19 endif 
    20  
    21 ifeq (@ac_pjmedia_snd@,pa_old_darwinos) 
    22 DIRS += build/portaudio 
    23 endif 
    24  
    25 ifeq (@ac_pjmedia_snd@,pa_darwinos) 
    26 DIRS += build/portaudio 
    27 endif 
    28  
    29 ifeq (@ac_pjmedia_snd@,pa_win32) 
    30 DIRS += build/portaudio 
    31 endif 
    32  
    33 ifeq (@ac_pjmedia_snd@,pa_unix) 
    34 DIRS += build/portaudio 
    35 endif 
    36  
    37  
     1include ../../build.mak 
     2include $(PJDIR)/build/common.mak 
    383 
    394all clean dep depend distclean realclean: 
    405        for dir in $(DIRS); do \ 
    41            if [ -d $$dir ]; then \ 
    426                if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \ 
    437                    true; \ 
     
    459                    exit 1; \ 
    4610                fi; \ 
    47            fi; \ 
    4811        done 
    4912 
  • pjproject/branches/split-3rd-party/third_party/build/portaudio

    • Property svn:ignore
      •  

        old new  
        11*.user 
        22.* 
        3 Makefile 
         3os-auto.mak 
  • pjproject/branches/split-3rd-party/third_party/build/portaudio/Makefile

    r1200 r1202  
    99export PORTAUDIO_LIB:=../../lib/libportaudio-$(TARGET_NAME)$(LIBEXT) 
    1010 
    11 PORTAUDIO_OBJS := pa_allocation.o \ 
     11PORTAUDIO_OBJS += pa_allocation.o \ 
    1212                  pa_converters.o \ 
    1313                  pa_cpuload.o \ 
    1414                  pa_dither.o \ 
     15                  pa_debugprint.o \ 
    1516                  pa_front.o \ 
    1617                  pa_process.o \ 
     
    2021 
    2122 
    22 # Define the desired sound device backend 
    23 # Valid values are: 
    24 #   - pa_unix:          PortAudio on Unix (OSS or ALSA) 
    25 #   - pa_darwinos:      PortAudio on MacOSX (CoreAudio) 
    26 #   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2) 
    27 #   - pa_win32:         PortAudio on Win32 (WMME) 
    28 # 
    29 # There are other values below, but these are handled by PJMEDIA's Makefile 
    30 #   - ds:               Win32 DirectSound (dsound.c) 
    31 #   - null:             Null sound device (nullsound.c) 
    32 AC_PJMEDIA_SND=@ac_pjmedia_snd@ 
    33  
    34 # For Unix, specify if ALSA should be supported 
    35 AC_PA_USE_ALSA=@ac_pa_use_alsa@ 
    36  
    37 # Additional PortAudio CFLAGS are in @ac_pa_cflags@ 
    38  
    39  
    40 # 
    41 # PortAudio on Unix 
    42 # 
    43 ifeq ($(AC_PJMEDIA_SND),pa_unix) 
    44 # Host APIs and utils 
    45 export PORTAUDIO_OBJS += pa_unix_hostapis.o pa_unix_util.o 
    46  
    47 # Include ALSA? 
    48 ifeq ($(AC_PA_USE_ALSA),1) 
    49 export CFLAGS += -DPA_USE_ALSA=1 
    50 export PORTAUDIO_OBJS += pa_linux_alsa.o 
    51 endif 
    52  
    53 export CFLAGS += -DPA_USE_OSS=1 
    54 export CFLAGS += @ac_pa_cflags@ 
    55 export PORTAUDIO_OBJS += pa_unix_oss.o 
    56 endif 
    57  
    58  
    59 # 
    60 # PortAudio on MacOS X (using current PortAudio) 
    61 # 
    62 ifeq ($(AC_PJMEDIA_SND),pa_darwinos) 
    63 export PORTAUDIO_OBJS +=pa_mac_hostapis.o \ 
    64                         pa_unix_util.o \ 
    65                         pa_mac_core.o \ 
    66                         pa_mac_core_blocking.o \ 
    67                         pa_mac_core_utilities.o \ 
    68                         pa_ringbuffer.o 
    69 export CFLAGS += -DPA_USE_COREAUDIO=1 
    70 export CFLAGS += @ac_pa_cflags@ 
    71 endif 
    72  
    73 # 
    74 # PortAudio on MacOS X (using old PortAudio, for MacOS X 10.2.x) 
    75 # 
    76 ifeq ($(AC_PJMEDIA_SND),pa_old_darwinos) 
    77 export PORTAUDIO_OBJS +=pa_mac_hostapis.o \ 
    78                         pa_unix_util.o \ 
    79                         pa_mac_core_old.o  
    80 export CFLAGS += -DPA_USE_COREAUDIO=1 
    81 export CFLAGS += @ac_pa_cflags@ 
    82 endif 
    83  
    84 # 
    85 # 
    86 # PortAudio on Win32 (WMME) 
    87 # 
    88 ifeq ($(AC_PJMEDIA_SND),pa_win32) 
    89 export PORTAUDIO_OBJS += pa_win_hostapis.o pa_win_util.o \ 
    90                        pa_win_wmme.o 
    91 export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS 
    92 endif 
    93  
    94  
    9523############################################################################### 
    9624# Gather all flags. 
    9725# 
    98 export _CFLAGS  := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ 
     26export _CFLAGS  += $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ 
    9927                   $(CFLAGS) $(CC_INC). $(CC_INC)src  
    100 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 
     28export _CXXFLAGS+= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 
    10129                   $(HOST_CXXFLAGS) $(CXXFLAGS) 
    102 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 
     30export _LDFLAGS += $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 
    10331                   $(LDFLAGS)  
    10432 
  • pjproject/branches/split-3rd-party/third_party/build/portaudio/os-auto.mak.in

    r1200 r1202  
    11# @configure_input@ 
    2 include ../../../build.mak 
    3 include $(PJDIR)/build/common.mak 
    4  
    5 export LIBDIR := ../../lib 
    6  
    7 RULES_MAK := $(PJDIR)/build/rules.mak 
    8  
    9 export PORTAUDIO_LIB:=../../lib/libportaudio-$(TARGET_NAME)$(LIBEXT) 
    10  
    11 PORTAUDIO_OBJS := pa_allocation.o \ 
    12                   pa_converters.o \ 
    13                   pa_cpuload.o \ 
    14                   pa_dither.o \ 
    15                   pa_front.o \ 
    16                   pa_process.o \ 
    17                   pa_skeleton.o \ 
    18                   pa_stream.o \ 
    19                   pa_trace.o 
    20  
    212 
    223# Define the desired sound device backend 
     
    9172export CFLAGS += -DPA_NO_ASIO -DPA_NO_DS 
    9273endif 
    93  
    94  
    95 ############################################################################### 
    96 # Gather all flags. 
    97 # 
    98 export _CFLAGS  := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ 
    99                    $(CFLAGS) $(CC_INC). $(CC_INC)src  
    100 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 
    101                    $(HOST_CXXFLAGS) $(CXXFLAGS) 
    102 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 
    103                    $(LDFLAGS)  
    104  
    105 ############################################################################### 
    106 # Defines for building PORTAUDIO library 
    107 # 
    108 export PORTAUDIO_SRCDIR = src 
    109 export PORTAUDIO_OBJS +=  
    110 export PORTAUDIO_CFLAGS += $(_CFLAGS) 
    111  
    112 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
    113 ############################################################################### 
    114 # Main entry 
    115 # 
    116 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    117 # 
    118 TARGETS := libportaudio 
    119  
    120 all: $(TARGETS) 
    121  
    122 dep: depend 
    123 distclean: realclean 
    124  
    125 .PHONY: dep depend libportaudio clean realclean distclean 
    126  
    127 libportaudio: 
    128         $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $(PORTAUDIO_LIB) 
    129  
    130 clean: 
    131         $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $@ 
    132  
    133 realclean: 
    134         $(subst @@,$(subst /,$(HOST_PSEP),.libportaudio-$(TARGET_NAME).depend),$(HOST_RMR)) 
    135          
    136         $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $@ 
    137  
    138 depend: 
    139         $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $@ 
    140         echo '$(PORTAUDIO_LIB): .libportaudio-$(TARGET_NAME).depend' >> .libportaudio-$(TARGET_NAME).depend; \ 
    141  
Note: See TracChangeset for help on using the changeset viewer.