Changeset 5268 for pjproject


Ignore:
Timestamp:
Mar 23, 2016 7:52:41 AM (9 years ago)
Author:
nanang
Message:

Close #1906: Removed PortAudio? from PJSIP source package.

Location:
pjproject/trunk
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/aconfigure

    r5264 r5268  
    22742274$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    22752275as_fn_error $? "failed to load site script $ac_site_file 
    2276 See \`config.log' for more details" "$LINENO" 5; } 
     2276See \`config.log' for more details" "$LINENO" 5 ; } 
    22772277  fi 
    22782278done 
    … …  
    24172417case $ac_cv_build in 
    24182418*-*-*) ;; 
    2419 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 
     2419*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 
    24202420esac 
    24212421build=$ac_cv_build 
    … …  
    24502450case $ac_cv_host in 
    24512451*-*-*) ;; 
    2452 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 
     2452*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 
    24532453esac 
    24542454host=$ac_cv_host 
    … …  
    24832483case $ac_cv_target in 
    24842484*-*-*) ;; 
    2485 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 
     2485*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 
    24862486esac 
    24872487target=$ac_cv_target 
    … …  
    28202820$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    28212821as_fn_error $? "no acceptable C compiler found in \$PATH 
    2822 See \`config.log' for more details" "$LINENO" 5; } 
     2822See \`config.log' for more details" "$LINENO" 5 ; } 
    28232823 
    28242824# Provide some information about the compiler. 
    … …  
    29352935$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29362936as_fn_error 77 "C compiler cannot create executables 
    2937 See \`config.log' for more details" "$LINENO" 5; } 
     2937See \`config.log' for more details" "$LINENO" 5 ; } 
    29382938else 
    29392939  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    … …  
    29782978$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    29792979as_fn_error $? "cannot compute suffix of executables: cannot compile and link 
    2980 See \`config.log' for more details" "$LINENO" 5; } 
     2980See \`config.log' for more details" "$LINENO" 5 ; } 
    29812981fi 
    29822982rm -f conftest conftest$ac_cv_exeext 
    … …  
    30373037as_fn_error $? "cannot run C compiled programs. 
    30383038If you meant to cross compile, use \`--host'. 
    3039 See \`config.log' for more details" "$LINENO" 5; } 
     3039See \`config.log' for more details" "$LINENO" 5 ; } 
    30403040    fi 
    30413041  fi 
    … …  
    30893089$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    30903090as_fn_error $? "cannot compute suffix of object files: cannot compile 
    3091 See \`config.log' for more details" "$LINENO" 5; } 
     3091See \`config.log' for more details" "$LINENO" 5 ; } 
    30923092fi 
    30933093rm -f conftest.$ac_cv_objext conftest.$ac_ext 
    … …  
    44834483$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    44844484as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 
    4485 See \`config.log' for more details" "$LINENO" 5; } 
     4485See \`config.log' for more details" "$LINENO" 5 ; } 
    44864486fi 
    44874487 
    … …  
    49734973   *) 
    49744974     as_fn_error $? "unknown endianness 
    4975  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 
     4975 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;; 
    49764976 esac 
    49774977 
    … …  
    61256125        ;; 
    61266126  *) 
    6127                 ac_pjmedia_snd=pa_unix 
     6127                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ALSA dev lib is installed" >&5 
     6128$as_echo_n "checking if ALSA dev lib is installed... " >&6; } 
     6129        ac_pjmedia_snd=alsa 
     6130        ac_pa_use_alsa=1 
     6131 
    61286132        ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" 
    61296133if test "x$ac_cv_header_alsa_version_h" = xyes; then : 
    6130   ac_pa_use_alsa=1 
    6131  
    6132                          ac_pjmedia_snd=alsa 
    61336134 
    61346135                         LIBS="$LIBS -lasound" 
    6135  
    6136 else 
    6137   ac_pa_use_alsa=0 
     6136                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
     6137$as_echo "yes" >&6; } 
     6138 
     6139else 
     6140 
     6141                         ac_pa_use_alsa=0 
     6142                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
     6143$as_echo "no" >&6; } 
    61386144 
    61396145fi 
    … …  
    76187624$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76197625as_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 
    7620 See \`config.log' for more details" "$LINENO" 5; } 
     7626See \`config.log' for more details" "$LINENO" 5 ; } 
    76217627fi 
    76227628rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    76747680$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76757681as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples? 
    7676 See \`config.log' for more details" "$LINENO" 5; } 
     7682See \`config.log' for more details" "$LINENO" 5 ; } 
    76777683            fi 
    76787684        else 
    … …  
    76807686$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76817687as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples? 
    7682 See \`config.log' for more details" "$LINENO" 5; } 
     7688See \`config.log' for more details" "$LINENO" 5 ; } 
    76837689        fi 
    76847690 
    … …  
    76887694$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    76897695as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist 
    7690 See \`config.log' for more details" "$LINENO" 5; } 
     7696See \`config.log' for more details" "$LINENO" 5 ; } 
    76917697            exit 1; 
    76927698        fi 
    … …  
    77027708$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77037709as_fn_error $? "bug in this script: unsupported IPP version 
    7704 See \`config.log' for more details" "$LINENO" 5; } 
     7710See \`config.log' for more details" "$LINENO" 5 ; } 
    77057711        fi 
    77067712 
    … …  
    77097715$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77107716as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR 
    7711 See \`config.log' for more details" "$LINENO" 5; } 
     7717See \`config.log' for more details" "$LINENO" 5 ; } 
    77127718        fi 
    77137719 
    … …  
    77457751$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
    77467752as_fn_error $? "no 
    7747 See \`config.log' for more details" "$LINENO" 5; } 
     7753See \`config.log' for more details" "$LINENO" 5 ; } 
    77487754fi 
    77497755rm -f core conftest.err conftest.$ac_objext \ 
    … …  
    91449150    "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; 
    91459151 
    9146   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 
     9152  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 
    91479153  esac 
    91489154done 
    … …  
    94619467  case $ac_mode$ac_tag in 
    94629468  :[FHL]*:*);; 
    9463   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 
     9469  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 
    94649470  :[FH]-) ac_tag=-:-;; 
    94659471  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 
    … …  
    94899495           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 
    94909496           esac || 
    9491            as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 
     9497           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 
    94929498      esac 
    94939499      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 
    … …  
    95169522    case $ac_tag in 
    95179523    *:-:* | *:-) cat >"$ac_tmp/stdin" \ 
    9518       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 
     9524      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;; 
    95199525    esac 
    95209526    ;; 

  • pjproject/trunk/aconfigure.ac

    r5264 r5268  
    663663  *) 
    664664        dnl # Check if ALSA is available 
    665         ac_pjmedia_snd=pa_unix 
     665        AC_MSG_CHECKING([if ALSA dev lib is installed]) 
     666        ac_pjmedia_snd=alsa 
     667        AC_SUBST(ac_pa_use_alsa,1) 
    666668        AC_CHECK_HEADER(alsa/version.h, 
    667                         [AC_SUBST(ac_pa_use_alsa,1) 
    668                          AC_SUBST(ac_pjmedia_snd,alsa) 
     669                        [ 
    669670                         LIBS="$LIBS -lasound" 
     671                         AC_MSG_RESULT(yes) 
    670672                        ], 
    671                         [AC_SUBST(ac_pa_use_alsa,0)]) 
     673                        [ 
     674                         ac_pa_use_alsa=0 
     675                         AC_MSG_RESULT(no) 
     676                        ]) 
    672677        AC_MSG_RESULT([Checking sound device backend... unix]) 
    673678 

  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r5199 r5268  
    192192# PortAudio 
    193193# 
    194 ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) 
    195194ifeq (@ac_external_pa@,1) 
    196195# External PA 
    197196export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 
    198 else 
    199 # Our PA in third_party 
    200 export CFLAGS += -I$(THIRD_PARTY)/build/portaudio \ 
    201                  -I$(THIRD_PARTY)/portaudio/include \ 
    202                  -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1 
    203 endif 
    204197endif 
    205198 

  • pjproject/trunk/pjmedia/include/pjmedia-audiodev/config.h

    r5201 r5268  
    6060 * This setting controls whether PortAudio support should be included. 
    6161 * 
    62  * By default it is enabled except on Windows platforms (including 
    63  * Windows Mobile) and Symbian. 
     62 * By default it is disabled. 
    6463 */ 
    6564#ifndef PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO 
    66 #   if (defined(PJ_WIN32) && PJ_WIN32!=0) || \ 
    67        (defined(PJ_WIN64) && PJ_WIN64!=0) || \ 
    68        (defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0) 
    69 #       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  0 
    70 #   else 
    71 #       define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO  1 
    72 #   endif 
     65#   define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO      0 
    7366#endif 
    7467 

  • pjproject/trunk/pjproject-vs14.sln

    r5172 r5268  
    4848EndProject 
    4949Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbccodec", "third_party\build\ilbc\libilbccodec.vcxproj", "{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}" 
    50 EndProject 
    51 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libportaudio", "third_party\build\portaudio\libportaudio.vcxproj", "{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}" 
    5250EndProject 
    5351Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "third_party\build\resample\libresample.vcxproj", "{6794B975-4E84-4F49-B2DC-C31F2224E03E}" 
    … …  
    459457                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    460458                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.Build.0 = Release-Static|x64 
    461                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.ActiveCfg = Debug|Win32 
    462                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.Build.0 = Debug|Win32 
    463                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.ActiveCfg = Debug|x64 
    464                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.Build.0 = Debug|x64 
    465                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
    466                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
    467                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 
    468                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
    469                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
    470                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
    471                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 
    472                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.Build.0 = Debug-Static|x64 
    473                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.ActiveCfg = Release|Win32 
    474                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.Build.0 = Release|Win32 
    475                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.ActiveCfg = Release|x64 
    476                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.Build.0 = Release|x64 
    477                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
    478                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
    479                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 
    480                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
    481                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
    482                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.Build.0 = Release-Static|Win32 
    483                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    484                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.Build.0 = Release-Static|x64 
    485459                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.ActiveCfg = Debug|Win32 
    486460                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.Build.0 = Debug|Win32 

  • pjproject/trunk/pjproject-vs8.sln

    r4704 r5268  
    4444EndProject 
    4545Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilbccodec", "third_party\build\ilbc\libilbccodec.vcproj", "{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}" 
    46 EndProject 
    47 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libportaudio", "third_party\build\portaudio\libportaudio.vcproj", "{3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}" 
    4846EndProject 
    4947Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "third_party\build\resample\libresample.vcproj", "{6794B975-4E84-4F49-B2DC-C31F2224E03E}" 
    … …  
    112110                {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 
    113111                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 
    114                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 
    115112                {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 
    116113                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 
    … …  
    17001697                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    17011698                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.Build.0 = Release-Static|x64 
    1702                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) 
    1703                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) 
    1704                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4) 
    1705                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4) 
    1706                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.ActiveCfg = Debug|Win32 
    1707                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Win32.Build.0 = Debug|Win32 
    1708                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1709                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1710                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1711                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1712                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) 
    1713                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) 
    1714                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I) 
    1715                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) 
    1716                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.ActiveCfg = Debug|x64 
    1717                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug|x64.Build.0 = Debug|x64 
    1718                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Pocket PC 2003 (ARMV4) 
    1719                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Debug-Dynamic|Pocket PC 2003 (ARMV4) 
    1720                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Smartphone 2003 (ARMV4) 
    1721                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Debug-Dynamic|Smartphone 2003 (ARMV4) 
    1722                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
    1723                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
    1724                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1725                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1726                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1727                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1728                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I) 
    1729                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I) 
    1730                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I) 
    1731                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I) 
    1732                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64 
    1733                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64 
    1734                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Static|Pocket PC 2003 (ARMV4) 
    1735                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Pocket PC 2003 (ARMV4).Build.0 = Debug-Static|Pocket PC 2003 (ARMV4) 
    1736                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Static|Smartphone 2003 (ARMV4) 
    1737                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Smartphone 2003 (ARMV4).Build.0 = Debug-Static|Smartphone 2003 (ARMV4) 
    1738                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
    1739                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
    1740                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1741                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1742                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1743                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1744                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I) 
    1745                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I) 
    1746                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
    1747                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
    1748                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.ActiveCfg = Debug-Static|x64 
    1749                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Debug-Static|x64.Build.0 = Debug-Static|x64 
    1750                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4) 
    1751                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4) 
    1752                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4) 
    1753                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4) 
    1754                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.ActiveCfg = Release|Win32 
    1755                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Win32.Build.0 = Release|Win32 
    1756                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1757                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1758                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1759                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1760                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) 
    1761                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) 
    1762                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I) 
    1763                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) 
    1764                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.ActiveCfg = Release|x64 
    1765                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release|x64.Build.0 = Release|x64 
    1766                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Dynamic|Pocket PC 2003 (ARMV4) 
    1767                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Release-Dynamic|Pocket PC 2003 (ARMV4) 
    1768                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release-Dynamic|Smartphone 2003 (ARMV4) 
    1769                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Release-Dynamic|Smartphone 2003 (ARMV4) 
    1770                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
    1771                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
    1772                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1773                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1774                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1775                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1776                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I) 
    1777                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I) 
    1778                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I) 
    1779                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I) 
    1780                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64 
    1781                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64 
    1782                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Static|Pocket PC 2003 (ARMV4) 
    1783                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Pocket PC 2003 (ARMV4).Build.0 = Release-Static|Pocket PC 2003 (ARMV4) 
    1784                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Pocket PC 2003 (ARMV4).Deploy.0 = Release-Static|Pocket PC 2003 (ARMV4) 
    1785                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release-Static|Smartphone 2003 (ARMV4) 
    1786                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Smartphone 2003 (ARMV4).Build.0 = Release-Static|Smartphone 2003 (ARMV4) 
    1787                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
    1788                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Win32.Build.0 = Release-Static|Win32 
    1789                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1790                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) 
    1791                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1792                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I) 
    1793                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 6 Professional SDK (ARMV4I) 
    1794                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 6 Professional SDK (ARMV4I) 
    1795                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
    1796                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
    1797                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.ActiveCfg = Release-Static|x64 
    1798                 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}.Release-Static|x64.Build.0 = Release-Static|x64 
    17991699                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4) 
    18001700                {6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4) 

  • pjproject/trunk/pjsip-apps/build/libpjproject.vcxproj

    r5168 r5268  
    5353  <PropertyGroup Label="Globals"> 
    5454    <ProjectGuid>{23D7679C-764C-4E02-8B29-BB882CEEEFE2}</ProjectGuid> 
    55     <RootNamespace>libpjproject</RootNamespace>  
     55    <RootNamespace>libpjproject</RootNamespace> 
    5656  </PropertyGroup> 
    5757  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 
    … …  
    133133  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets"> 
    134134    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    135         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    136     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />     
     135    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     136    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    137137  </ImportGroup> 
    138138  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets"> 
    139139    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    140         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    141     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     140    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     141    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    142142  </ImportGroup> 
    143143  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets"> 
    144144    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    145         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    146     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     145    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     146    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    147147  </ImportGroup> 
    148148  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets"> 
    149149    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    150         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    151     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     150    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     151    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    152152  </ImportGroup> 
    153153  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> 
    154154    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    155         <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
    156     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     155    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" /> 
     156    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    157157  </ImportGroup> 
    158158  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> 
    159159    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    160         <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
    161     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     160    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" /> 
     161    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    162162  </ImportGroup> 
    163163  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets"> 
    164164    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    165         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    166     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />     
     165    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     166    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" /> 
    167167  </ImportGroup> 
    168168  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets"> 
    169169    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    170         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    171     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />     
     170    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     171    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" /> 
    172172  </ImportGroup> 
    173173  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets"> 
    174174    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    175         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    176     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     175    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     176    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    177177  </ImportGroup> 
    178178  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets"> 
    179179    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    180         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    181     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     180    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     181    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    182182  </ImportGroup> 
    183183  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> 
    184184    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    185         <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
    186     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />     
     185    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" /> 
     186    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" /> 
    187187  </ImportGroup> 
    188188  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> 
    189189    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
    190         <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
    191     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />     
     190    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" /> 
     191    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" /> 
    192192  </ImportGroup> 
    193193  <PropertyGroup Label="UserMacros" /> 
    194194  <PropertyGroup> 
    195195    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion> 
    196         <OutDir>..\..\lib\</OutDir> 
     196    <OutDir>..\..\lib\</OutDir> 
    197197  </PropertyGroup> 
    198198  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 
    … …  
    433433      <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    434434    </ProjectReference> 
    435     <ProjectReference Include="..\..\third_party\build\portaudio\libportaudio.vcxproj"> 
    436       <Project>{3cf9ffa9-8387-4635-9d1b-e7944cbefeaa}</Project> 
    437       <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 
    438     </ProjectReference> 
    439435    <ProjectReference Include="..\..\third_party\build\resample\libresample.vcxproj"> 
    440436      <Project>{6794b975-4e84-4f49-b2dc-c31f2224e03e}</Project> 

  • pjproject/trunk/third_party

    • Property svn:externals deleted

  • pjproject/trunk/third_party/build/os-auto.mak.in

    r4701 r5268  
    2828# External PA 
    2929else 
    30 DIRS += portaudio 
     30#DIRS += portaudio 
    3131endif 
    3232endif 
Note: See TracChangeset for help on using the changeset viewer.