Changeset 5137


Ignore:
Timestamp:
Jul 29, 2015 2:31:12 AM (9 years ago)
Author:
nanang
Message:

Re #1870: Fixed 64 bit arch issues on iOS: pool alignment, updated config.sub, updated lib/app file naming, lib dependencies on XCode.

Location:
pjproject/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r5134 r5137  
    22592259$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22602260as_fn_error $? "failed to load site script $ac_site_file 
    2261 See \`config.log' for more details" "$LINENO" 5 ; } 
     2261See \`config.log' for more details" "$LINENO" 5; } 
    22622262  fi 
    22632263done 
    … …  
    24022402case $ac_cv_build in 
    24032403*-*-*) ;; 
    2404 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
     2404*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
    24052405esac 
    24062406build=$ac_cv_build 
    … …  
    24352435case $ac_cv_host in 
    24362436*-*-*) ;; 
    2437 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
     2437*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
    24382438esac 
    24392439host=$ac_cv_host 
    … …  
    24682468case $ac_cv_target in 
    24692469*-*-*) ;; 
    2470 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
     2470*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
    24712471esac 
    24722472target=$ac_cv_target 
    … …  
    28052805$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28062806as_fn_error $? "no acceptable C compiler found in \$PATH 
    2807 See \`config.log' for more details" "$LINENO" 5 ; } 
     2807See \`config.log' for more details" "$LINENO" 5; } 
    28082808 
    28092809# Provide some information about the compiler. 
    … …  
    29202920$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29212921as_fn_error 77 "C compiler cannot create executables 
    2922 See \`config.log' for more details" "$LINENO" 5 ; } 
     2922See \`config.log' for more details" "$LINENO" 5; } 
    29232923else 
    29242924  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29632963$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29642964as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2965 See \`config.log' for more details" "$LINENO" 5 ; } 
     2965See \`config.log' for more details" "$LINENO" 5; } 
    29662966fi 
    29672967rm -f conftest conftest$ac_cv_exeext 
    … …  
    30223022as_fn_error $? "cannot run C compiled programs. 
    30233023If you meant to cross compile, use \`--host'. 
    3024 See \`config.log' for more details" "$LINENO" 5 ; } 
     3024See \`config.log' for more details" "$LINENO" 5; } 
    30253025    fi 
    30263026  fi 
    … …  
    30743074$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30753075as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3076 See \`config.log' for more details" "$LINENO" 5 ; } 
     3076See \`config.log' for more details" "$LINENO" 5; } 
    30773077fi 
    30783078rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    43254325$as_echo_n "checking memory alignment... " >&6; } 
    43264326case $target in 
    4327     sparc64-* | ia64-* | x86_64-* ) 
     4327    sparc64-* | ia64-* | x86_64-* | arm64-* ) 
    43284328        $as_echo "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h 
    43294329 
    … …  
    44684468$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44694469as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4470 See \`config.log' for more details" "$LINENO" 5 ; } 
     4470See \`config.log' for more details" "$LINENO" 5; } 
    44714471fi 
    44724472 
    … …  
    49584958   *) 
    49594959     as_fn_error $? "unknown endianness 
    4960  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
     4960 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
    49614961 esac 
    49624962 
    … …  
    57095709        ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" 
    57105710        case $target in 
    5711           arm-apple-darwin*) 
     5711          arm*-apple-darwin*) 
    57125712                ac_os_objs="$ac_os_objs os_info_iphone.o" 
    57135713                ;; 
    … …  
    60666066$as_echo "Checking sound device backend... OpenSL ES" >&6; } 
    60676067        ;; 
    6068   arm-apple-darwin*) 
     6068  arm*-apple-darwin*) 
    60696069        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" 
    60706070        ac_pjmedia_audiodev_objs="coreaudio_dev.o" 
    … …  
    61526152        LIBS="$LIBS -llog" 
    61536153        ;; 
    6154  arm-apple-darwin*) 
     6154 arm*-apple-darwin*) 
    61556155        LIBS="$LIBS -framework UIKit" 
    61566156        ;; 
    … …  
    62006200        ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" 
    62016201        ;; 
    6202   arm-apple-darwin*) 
     6202  arm*-apple-darwin*) 
    62036203        ac_pjmedia_video=iphone_os 
    62046204 
    … …  
    72347234 
    72357235                        case $target in 
    7236                             arm-apple-darwin*) 
     7236                            arm*-apple-darwin*) 
    72377237                                LIBYUV_LDFLAGS="-L$LIBYUV_PREFIX/out_ios/Release-iphoneos" 
    72387238                                case $ARCH in 
    … …  
    74727472$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    74737473as_fn_error $? "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info 
    7474 See \`config.log' for more details" "$LINENO" 5 ; } 
     7474See \`config.log' for more details" "$LINENO" 5; } 
    74757475fi 
    74767476rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    75287528$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75297529as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7530 See \`config.log' for more details" "$LINENO" 5 ; } 
     7530See \`config.log' for more details" "$LINENO" 5; } 
    75317531            fi 
    75327532        else 
    … …  
    75347534$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75357535as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7536 See \`config.log' for more details" "$LINENO" 5 ; } 
     7536See \`config.log' for more details" "$LINENO" 5; } 
    75377537        fi 
    75387538 
    … …  
    75427542$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75437543as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7544 See \`config.log' for more details" "$LINENO" 5 ; } 
     7544See \`config.log' for more details" "$LINENO" 5; } 
    75457545            exit 1; 
    75467546        fi 
    … …  
    75567556$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75577557as_fn_error $? "bug in this script: unsupported IPP version 
    7558 See \`config.log' for more details" "$LINENO" 5 ; } 
     7558See \`config.log' for more details" "$LINENO" 5; } 
    75597559        fi 
    75607560 
    … …  
    75637563$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    75647564as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7565 See \`config.log' for more details" "$LINENO" 5 ; } 
     7565See \`config.log' for more details" "$LINENO" 5; } 
    75667566        fi 
    75677567 
    … …  
    75997599$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76007600as_fn_error $? "no 
    7601 See \`config.log' for more details" "$LINENO" 5 ; } 
     7601See \`config.log' for more details" "$LINENO" 5; } 
    76027602fi 
    76037603rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    88998899    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    89008900 
    8901   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
     8901  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
    89028902  esac 
    89038903done 
    … …  
    92169216  case $ac_mode$ac_tag in 
    92179217  :[FHL]*:*);; 
    9218   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
     9218  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
    92199219  :[FH]-) ac_tag=-:-;; 
    92209220  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    92449244           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    92459245           esac || 
    9246            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
     9246           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
    92479247      esac 
    92489248      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    92719271    case $ac_tag in 
    92729272    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    9273       || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
     9273      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
    92749274    esac 
    92759275    ;; 

  • pjproject/trunk/aconfigure.ac

    r5134 r5137  
    127127AC_MSG_CHECKING([memory alignment]) 
    128128case $target in 
    129     sparc64-* | ia64-* | x86_64-* ) 
     129    sparc64-* | ia64-* | x86_64-* | arm64-* ) 
    130130        AC_DEFINE(PJ_POOL_ALIGNMENT, 8) 
    131131        AC_MSG_RESULT([8 bytes]) 
    … …  
    447447        ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" 
    448448        case $target in 
    449           arm-apple-darwin*) 
     449          arm*-apple-darwin*) 
    450450                ac_os_objs="$ac_os_objs os_info_iphone.o" 
    451451                ;; 
    … …  
    624624        AC_MSG_RESULT([Checking sound device backend... OpenSL ES]) 
    625625        ;; 
    626   arm-apple-darwin*) 
     626  arm*-apple-darwin*) 
    627627        LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" 
    628628        ac_pjmedia_audiodev_objs="coreaudio_dev.o" 
    … …  
    696696        LIBS="$LIBS -llog" 
    697697        ;; 
    698  arm-apple-darwin*) 
     698 arm*-apple-darwin*) 
    699699        LIBS="$LIBS -framework UIKit" 
    700700        ;; 
    … …  
    725725        ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" 
    726726        ;; 
    727   arm-apple-darwin*) 
     727  arm*-apple-darwin*) 
    728728        ac_pjmedia_video=iphone_os 
    729729        AC_SUBST(ac_pjmedia_video_has_ios) 
    … …  
    12081208                         
    12091209                        case $target in 
    1210                             arm-apple-darwin*) 
     1210                            arm*-apple-darwin*) 
    12111211                                LIBYUV_LDFLAGS="-L$LIBYUV_PREFIX/out_ios/Release-iphoneos" 
    12121212                                case $ARCH in 

  • pjproject/trunk/config.sub

    r4435 r5137  
    260260        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 
    261261        | am33_2.0 \ 
    262         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ 
     262        | arc | arm | arm64 | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | armv[67] | armv7s | avr | avr32 \ 
    263263        | be32 | be64 \ 
    264264        | bfin \ 
    … …  
    372372        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ 
    373373        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 
    374         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \ 
     374        | arm-*  | arm64-*  | armbe-* | armle-* | armeb-* | armv*-* \ 
    375375        | avr-* | avr32-* \ 
    376376        | be32-* | be64-* \ 

  • pjproject/trunk/configure-iphone

    r4633 r5137  
    114114  echo "$F: ARCH is not specified, choosing ${ARCH}" 
    115115fi 
     116export ARCH_VAL=`echo ${ARCH} | sed 's/\-arch //' | sed -e 's/^[ \t]*//;s/[ \t]*$//' ` 
    116117 
    117118# Set CXX if not set 
    … …  
    142143  echo " AR = ${AR}" 
    143144  echo " RANLIB = ${RANLIB}" 
     145  echo " ARCH = ${ARCH_VAL}" 
    144146fi 
    145147 
    146148# And finally invoke the configure script itself 
    147 ./aconfigure --host=arm-apple-darwin9 --disable-sdl $* 
     149./aconfigure --host=${ARCH_VAL}-apple-darwin --disable-sdl $* 
    148150 
    149151if test "$?" = "0"; then 

  • pjproject/trunk/pjsip-apps/build/Makefile

    r4753 r5137  
    66 
    77RULES_MAK := $(PJDIR)/build/rules.mak 
    8  
    9 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 
    10 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 
    11 PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 
    12 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 
    13 PJMEDIA_AUDIODEV_LIB:=../../pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 
    14 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 
    15 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 
    16 PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 
    17 PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 
    18 PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 
    198 
    209 
    … …  
    7968$(PJSUA_EXE): 
    8069        $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 
     70        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ 
     71          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ 
     72            if test -f $$F; then \ 
     73              tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ 
     74              ln -sf $$F ../src/pjsua/ios/$$tmp; \ 
     75            fi; \ 
     76          done; \ 
     77        fi; 
    8178 
    8279pjsystest: $(PJSYSTEST_EXE) 
    … …  
    9996          echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \ 
    10097        fi 
    101  
    102  
    103  
     98        @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ 
     99          for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ 
     100            tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ 
     101            rm -f ../src/pjsua/ios/$$tmp; \ 
     102          done; \ 
     103        fi; 

  • pjproject/trunk/pjsip-apps/src/pjsua/ios

    • Property svn:ignore set to
      lib*.a

  • pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj

    r5116 r5137  
    3636                3AF0582516F050780046B835 /* ipjsuaViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AF0582316F050780046B835 /* ipjsuaViewController_iPhone.xib */; }; 
    3737                3AF0582816F050780046B835 /* ipjsuaViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3AF0582616F050780046B835 /* ipjsuaViewController_iPad.xib */; }; 
    38                 3AF0583716F057740046B835 /* libpj-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583616F057740046B835 /* libpj-arm-apple-darwin9.a */; }; 
    39                 3AF0583916F057890046B835 /* libpjlib-util-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583816F057890046B835 /* libpjlib-util-arm-apple-darwin9.a */; }; 
    40                 3AF0583F16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583A16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a */; }; 
    41                 3AF0584016F057B30046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583B16F057B20046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a */; }; 
    42                 3AF0584116F057B30046B835 /* libpjmedia-codec-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583C16F057B20046B835 /* libpjmedia-codec-arm-apple-darwin9.a */; }; 
    43                 3AF0584216F057B30046B835 /* libpjmedia-videodev-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583D16F057B20046B835 /* libpjmedia-videodev-arm-apple-darwin9.a */; }; 
    44                 3AF0584316F057B30046B835 /* libpjsdp-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0583E16F057B20046B835 /* libpjsdp-arm-apple-darwin9.a */; }; 
    45                 3AF0584516F057D30046B835 /* libpjnath-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584416F057D30046B835 /* libpjnath-arm-apple-darwin9.a */; }; 
    46                 3AF0584A16F057F70046B835 /* libpjsip-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584616F057F70046B835 /* libpjsip-arm-apple-darwin9.a */; }; 
    47                 3AF0584B16F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584716F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a */; }; 
    48                 3AF0584C16F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584816F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a */; }; 
    49                 3AF0584D16F057F70046B835 /* libpjsua-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584916F057F70046B835 /* libpjsua-arm-apple-darwin9.a */; }; 
    50                 3AF0585516F058290046B835 /* libg7221codec-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584E16F058290046B835 /* libg7221codec-arm-apple-darwin9.a */; }; 
    51                 3AF0585616F058290046B835 /* libgsmcodec-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0584F16F058290046B835 /* libgsmcodec-arm-apple-darwin9.a */; }; 
    52                 3AF0585716F058290046B835 /* libilbccodec-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0585016F058290046B835 /* libilbccodec-arm-apple-darwin9.a */; }; 
    53                 3AF0585916F058290046B835 /* libresample-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0585216F058290046B835 /* libresample-arm-apple-darwin9.a */; }; 
    54                 3AF0585A16F058290046B835 /* libspeex-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0585316F058290046B835 /* libspeex-arm-apple-darwin9.a */; }; 
    55                 3AF0585B16F058290046B835 /* libsrtp-arm-apple-darwin9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0585416F058290046B835 /* libsrtp-arm-apple-darwin9.a */; }; 
    5638                3AFFF4DA19BD59AB0067F226 /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */; }; 
     39                E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D41B67A45500017E67 /* libg7221codec.a */; }; 
     40                E5E991E71B67A45500017E67 /* libgsmcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D51B67A45500017E67 /* libgsmcodec.a */; }; 
     41                E5E991E81B67A45500017E67 /* libilbccodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D61B67A45500017E67 /* libilbccodec.a */; }; 
     42                E5E991E91B67A45500017E67 /* libpj.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D71B67A45500017E67 /* libpj.a */; }; 
     43                E5E991EA1B67A45500017E67 /* libpjlib-util.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D81B67A45500017E67 /* libpjlib-util.a */; }; 
     44                E5E991EB1B67A45500017E67 /* libpjmedia-audiodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991D91B67A45500017E67 /* libpjmedia-audiodev.a */; }; 
     45                E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DA1B67A45500017E67 /* libpjmedia-codec.a */; }; 
     46                E5E991ED1B67A45500017E67 /* libpjmedia-videodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DB1B67A45500017E67 /* libpjmedia-videodev.a */; }; 
     47                E5E991EE1B67A45500017E67 /* libpjmedia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DC1B67A45500017E67 /* libpjmedia.a */; }; 
     48                E5E991EF1B67A45500017E67 /* libpjnath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DD1B67A45500017E67 /* libpjnath.a */; }; 
     49                E5E991F01B67A45500017E67 /* libpjsip-simple.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DE1B67A45500017E67 /* libpjsip-simple.a */; }; 
     50                E5E991F11B67A45500017E67 /* libpjsip-ua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991DF1B67A45500017E67 /* libpjsip-ua.a */; }; 
     51                E5E991F21B67A45500017E67 /* libpjsip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E01B67A45500017E67 /* libpjsip.a */; }; 
     52                E5E991F31B67A45500017E67 /* libpjsua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E11B67A45500017E67 /* libpjsua.a */; }; 
     53                E5E991F41B67A45500017E67 /* libpjsua2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E21B67A45500017E67 /* libpjsua2.a */; }; 
     54                E5E991F51B67A45500017E67 /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E31B67A45500017E67 /* libresample.a */; }; 
     55                E5E991F61B67A45500017E67 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E41B67A45500017E67 /* libspeex.a */; }; 
     56                E5E991F71B67A45500017E67 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5E991E51B67A45500017E67 /* libsrtp.a */; }; 
    5757/* End PBXBuildFile section */ 
    5858 
    … …  
    9191                3AF0582416F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ipjsuaViewController_iPhone.xib; sourceTree = "<group>"; }; 
    9292                3AF0582716F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ipjsuaViewController_iPad.xib; sourceTree = "<group>"; }; 
    93                 3AF0583616F057740046B835 /* libpj-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpj-arm-apple-darwin9.a"; path = "../../../../pjlib/lib/libpj-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    94                 3AF0583816F057890046B835 /* libpjlib-util-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util-arm-apple-darwin9.a"; path = "../../../../pjlib-util/lib/libpjlib-util-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    95                 3AF0583A16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-arm-apple-darwin9.a"; path = "../../../../pjmedia/lib/libpjmedia-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    96                 3AF0583B16F057B20046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev-arm-apple-darwin9.a"; path = "../../../../pjmedia/lib/libpjmedia-audiodev-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    97                 3AF0583C16F057B20046B835 /* libpjmedia-codec-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec-arm-apple-darwin9.a"; path = "../../../../pjmedia/lib/libpjmedia-codec-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    98                 3AF0583D16F057B20046B835 /* libpjmedia-videodev-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev-arm-apple-darwin9.a"; path = "../../../../pjmedia/lib/libpjmedia-videodev-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    99                 3AF0583E16F057B20046B835 /* libpjsdp-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsdp-arm-apple-darwin9.a"; path = "../../../../pjmedia/lib/libpjsdp-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    100                 3AF0584416F057D30046B835 /* libpjnath-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjnath-arm-apple-darwin9.a"; path = "../../../../pjnath/lib/libpjnath-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    101                 3AF0584616F057F70046B835 /* libpjsip-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-arm-apple-darwin9.a"; path = "../../../../pjsip/lib/libpjsip-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    102                 3AF0584716F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple-arm-apple-darwin9.a"; path = "../../../../pjsip/lib/libpjsip-simple-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    103                 3AF0584816F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua-arm-apple-darwin9.a"; path = "../../../../pjsip/lib/libpjsip-ua-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    104                 3AF0584916F057F70046B835 /* libpjsua-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua-arm-apple-darwin9.a"; path = "../../../../pjsip/lib/libpjsua-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    105                 3AF0584E16F058290046B835 /* libg7221codec-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libg7221codec-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libg7221codec-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    106                 3AF0584F16F058290046B835 /* libgsmcodec-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgsmcodec-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libgsmcodec-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    107                 3AF0585016F058290046B835 /* libilbccodec-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libilbccodec-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libilbccodec-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    108                 3AF0585216F058290046B835 /* libresample-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libresample-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libresample-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    109                 3AF0585316F058290046B835 /* libspeex-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libspeex-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libspeex-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    110                 3AF0585416F058290046B835 /* libsrtp-arm-apple-darwin9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsrtp-arm-apple-darwin9.a"; path = "../../../../third_party/lib/libsrtp-arm-apple-darwin9.a"; sourceTree = "<group>"; }; 
    11193                3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; 
     94                E5E991D41B67A45500017E67 /* libg7221codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libg7221codec.a; sourceTree = "<group>"; }; 
     95                E5E991D51B67A45500017E67 /* libgsmcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgsmcodec.a; sourceTree = "<group>"; }; 
     96                E5E991D61B67A45500017E67 /* libilbccodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libilbccodec.a; sourceTree = "<group>"; }; 
     97                E5E991D71B67A45500017E67 /* libpj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpj.a; sourceTree = "<group>"; }; 
     98                E5E991D81B67A45500017E67 /* libpjlib-util.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjlib-util.a"; sourceTree = "<group>"; }; 
     99                E5E991D91B67A45500017E67 /* libpjmedia-audiodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-audiodev.a"; sourceTree = "<group>"; }; 
     100                E5E991DA1B67A45500017E67 /* libpjmedia-codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-codec.a"; sourceTree = "<group>"; }; 
     101                E5E991DB1B67A45500017E67 /* libpjmedia-videodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-videodev.a"; sourceTree = "<group>"; }; 
     102                E5E991DC1B67A45500017E67 /* libpjmedia.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjmedia.a; sourceTree = "<group>"; }; 
     103                E5E991DD1B67A45500017E67 /* libpjnath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjnath.a; sourceTree = "<group>"; }; 
     104                E5E991DE1B67A45500017E67 /* libpjsip-simple.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjsip-simple.a"; sourceTree = "<group>"; }; 
     105                E5E991DF1B67A45500017E67 /* libpjsip-ua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjsip-ua.a"; sourceTree = "<group>"; }; 
     106                E5E991E01B67A45500017E67 /* libpjsip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsip.a; sourceTree = "<group>"; }; 
     107                E5E991E11B67A45500017E67 /* libpjsua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsua.a; sourceTree = "<group>"; }; 
     108                E5E991E21B67A45500017E67 /* libpjsua2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsua2.a; sourceTree = "<group>"; }; 
     109                E5E991E31B67A45500017E67 /* libresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libresample.a; sourceTree = "<group>"; }; 
     110                E5E991E41B67A45500017E67 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libspeex.a; sourceTree = "<group>"; }; 
     111                E5E991E51B67A45500017E67 /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsrtp.a; sourceTree = "<group>"; }; 
    112112/* End PBXFileReference section */ 
    113113 
    … …  
    117117                        buildActionMask = 2147483647; 
    118118                        files = ( 
     119                                E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */, 
    119120                                3AFFF4DA19BD59AB0067F226 /* libstdc++.dylib in Frameworks */, 
    120121                                3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */, 
    121                                 3AF0583716F057740046B835 /* libpj-arm-apple-darwin9.a in Frameworks */, 
    122                                 3AF0583916F057890046B835 /* libpjlib-util-arm-apple-darwin9.a in Frameworks */, 
    123                                 3AF0583F16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a in Frameworks */, 
     122                                E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */, 
     123                                E5E991EB1B67A45500017E67 /* libpjmedia-audiodev.a in Frameworks */, 
    124124                                3AA31FFB18F3FB4C00112C3D /* CoreImage.framework in Frameworks */, 
     125                                E5E991F41B67A45500017E67 /* libpjsua2.a in Frameworks */, 
    125126                                3AA31FF618F3FB4C00112C3D /* AudioToolbox.framework in Frameworks */, 
    126                                 3AF0584016F057B30046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a in Frameworks */, 
    127                                 3AF0584116F057B30046B835 /* libpjmedia-codec-arm-apple-darwin9.a in Frameworks */, 
    128                                 3AF0584216F057B30046B835 /* libpjmedia-videodev-arm-apple-darwin9.a in Frameworks */, 
    129                                 3AF0584316F057B30046B835 /* libpjsdp-arm-apple-darwin9.a in Frameworks */, 
    130127                                3AA31FF718F3FB4C00112C3D /* AVFoundation.framework in Frameworks */, 
    131                                 3AF0584516F057D30046B835 /* libpjnath-arm-apple-darwin9.a in Frameworks */, 
    132128                                3AA31FFE18F3FB4C00112C3D /* OpenGLES.framework in Frameworks */, 
    133                                 3AF0584A16F057F70046B835 /* libpjsip-arm-apple-darwin9.a in Frameworks */, 
    134129                                3AA3200018F3FB4C00112C3D /* Foundation.framework in Frameworks */, 
     130                                E5E991E71B67A45500017E67 /* libgsmcodec.a in Frameworks */, 
     131                                E5E991F31B67A45500017E67 /* libpjsua.a in Frameworks */, 
     132                                E5E991EE1B67A45500017E67 /* libpjmedia.a in Frameworks */, 
     133                                E5E991EA1B67A45500017E67 /* libpjlib-util.a in Frameworks */, 
     134                                E5E991ED1B67A45500017E67 /* libpjmedia-videodev.a in Frameworks */, 
     135                                E5E991E81B67A45500017E67 /* libilbccodec.a in Frameworks */, 
    135136                                3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */, 
    136                                 3AF0584B16F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a in Frameworks */, 
    137137                                3AA31FF918F3FB4C00112C3D /* CoreAudio.framework in Frameworks */, 
    138138                                3AA31FFD18F3FB4C00112C3D /* CoreVideo.framework in Frameworks */, 
    139                                 3AF0584C16F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a in Frameworks */, 
    140139                                3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */, 
    141140                                3AA31FFA18F3FB4C00112C3D /* CoreFoundation.framework in Frameworks */, 
    142                                 3AF0584D16F057F70046B835 /* libpjsua-arm-apple-darwin9.a in Frameworks */, 
     141                                E5E991F01B67A45500017E67 /* libpjsip-simple.a in Frameworks */, 
     142                                E5E991E91B67A45500017E67 /* libpj.a in Frameworks */, 
     143                                E5E991F71B67A45500017E67 /* libsrtp.a in Frameworks */, 
    143144                                3AA31FFC18F3FB4C00112C3D /* CoreMedia.framework in Frameworks */, 
    144                                 3AF0585516F058290046B835 /* libg7221codec-arm-apple-darwin9.a in Frameworks */, 
    145                                 3AF0585616F058290046B835 /* libgsmcodec-arm-apple-darwin9.a in Frameworks */, 
     145                                E5E991F21B67A45500017E67 /* libpjsip.a in Frameworks */, 
     146                                E5E991F51B67A45500017E67 /* libresample.a in Frameworks */, 
     147                                E5E991F61B67A45500017E67 /* libspeex.a in Frameworks */, 
     148                                E5E991EF1B67A45500017E67 /* libpjnath.a in Frameworks */, 
     149                                E5E991F11B67A45500017E67 /* libpjsip-ua.a in Frameworks */, 
    146150                                3AA31FFF18F3FB4C00112C3D /* QuartzCore.framework in Frameworks */, 
    147                                 3AF0585716F058290046B835 /* libilbccodec-arm-apple-darwin9.a in Frameworks */, 
    148                                 3AF0585916F058290046B835 /* libresample-arm-apple-darwin9.a in Frameworks */, 
    149                                 3AF0585A16F058290046B835 /* libspeex-arm-apple-darwin9.a in Frameworks */, 
    150                                 3AF0585B16F058290046B835 /* libsrtp-arm-apple-darwin9.a in Frameworks */, 
    151151                        ); 
    152152                        runOnlyForDeploymentPostprocessing = 0; 
    … …  
    239239                        children = ( 
    240240                                3AFFF4D919BD59AB0067F226 /* libstdc++.dylib */, 
    241                                 3AF0584E16F058290046B835 /* libg7221codec-arm-apple-darwin9.a */, 
    242                                 3AF0584F16F058290046B835 /* libgsmcodec-arm-apple-darwin9.a */, 
    243                                 3AF0585016F058290046B835 /* libilbccodec-arm-apple-darwin9.a */, 
    244                                 3AF0585216F058290046B835 /* libresample-arm-apple-darwin9.a */, 
    245                                 3AF0585316F058290046B835 /* libspeex-arm-apple-darwin9.a */, 
    246                                 3AF0585416F058290046B835 /* libsrtp-arm-apple-darwin9.a */, 
    247                                 3AF0584616F057F70046B835 /* libpjsip-arm-apple-darwin9.a */, 
    248                                 3AF0584716F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a */, 
    249                                 3AF0584816F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a */, 
    250                                 3AF0584916F057F70046B835 /* libpjsua-arm-apple-darwin9.a */, 
    251                                 3AF0584416F057D30046B835 /* libpjnath-arm-apple-darwin9.a */, 
    252                                 3AF0583A16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a */, 
    253                                 3AF0583B16F057B20046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a */, 
    254                                 3AF0583C16F057B20046B835 /* libpjmedia-codec-arm-apple-darwin9.a */, 
    255                                 3AF0583D16F057B20046B835 /* libpjmedia-videodev-arm-apple-darwin9.a */, 
    256                                 3AF0583E16F057B20046B835 /* libpjsdp-arm-apple-darwin9.a */, 
    257                                 3AF0583816F057890046B835 /* libpjlib-util-arm-apple-darwin9.a */, 
    258                                 3AF0583616F057740046B835 /* libpj-arm-apple-darwin9.a */, 
     241                                E5E991D41B67A45500017E67 /* libg7221codec.a */, 
     242                                E5E991D51B67A45500017E67 /* libgsmcodec.a */, 
     243                                E5E991D61B67A45500017E67 /* libilbccodec.a */, 
     244                                E5E991D71B67A45500017E67 /* libpj.a */, 
     245                                E5E991D81B67A45500017E67 /* libpjlib-util.a */, 
     246                                E5E991D91B67A45500017E67 /* libpjmedia-audiodev.a */, 
     247                                E5E991DA1B67A45500017E67 /* libpjmedia-codec.a */, 
     248                                E5E991DB1B67A45500017E67 /* libpjmedia-videodev.a */, 
     249                                E5E991DC1B67A45500017E67 /* libpjmedia.a */, 
     250                                E5E991DD1B67A45500017E67 /* libpjnath.a */, 
     251                                E5E991DE1B67A45500017E67 /* libpjsip-simple.a */, 
     252                                E5E991DF1B67A45500017E67 /* libpjsip-ua.a */, 
     253                                E5E991E01B67A45500017E67 /* libpjsip.a */, 
     254                                E5E991E11B67A45500017E67 /* libpjsua.a */, 
     255                                E5E991E21B67A45500017E67 /* libpjsua2.a */, 
     256                                E5E991E31B67A45500017E67 /* libresample.a */, 
     257                                E5E991E41B67A45500017E67 /* libspeex.a */, 
     258                                E5E991E51B67A45500017E67 /* libsrtp.a */, 
    259259                        ); 
    260260                        name = Libraries; 
    … …  
    456456                                        "\"$(SRCROOT)/../../../../pjsip/lib\"", 
    457457                                        "\"$(SRCROOT)/../../../../third_party/lib\"", 
     458                                        "$(PROJECT_DIR)", 
    458459                                ); 
    459460                                ONLY_ACTIVE_ARCH = YES; 
    … …  
    492493                                        "\"$(SRCROOT)/../../../../pjsip/lib\"", 
    493494                                        "\"$(SRCROOT)/../../../../third_party/lib\"", 
     495                                        "$(PROJECT_DIR)", 
    494496                                ); 
    495497                                ONLY_ACTIVE_ARCH = YES; 
Note: See TracChangeset for help on using the changeset viewer.