Skip to content
Browse files

Import pjproject-2.5

  • Loading branch information...
1 parent 434bd52 commit 906f73473302fbd56dc49b8612da1165dece8c1e @gtjoseph gtjoseph committed May 30, 2016
Showing with 13,251 additions and 3,447 deletions.
  1. +1 −0 README.txt
  2. +331 −19 aconfigure
  3. +154 −16 aconfigure.ac
  4. +34 −0 build/vs/pjproject-vs14-common-defaults.props
  5. +21 −0 build/vs/pjproject-vs14-debug-defaults.props
  6. +16 −0 build/vs/pjproject-vs14-debug-dynamic-defaults.props
  7. +16 −0 build/vs/pjproject-vs14-debug-static-defaults.props
  8. +18 −0 build/vs/pjproject-vs14-release-defaults.props
  9. +16 −0 build/vs/pjproject-vs14-release-dynamic-defaults.props
  10. +16 −0 build/vs/pjproject-vs14-release-static-defaults.props
  11. +25 −0 build/vs/pjproject-vs14-win32-common-defaults.props
  12. +12 −0 build/vs/pjproject-vs14-win32-release-defaults.props
  13. +25 −0 build/vs/pjproject-vs14-win64-common-defaults.props
  14. +12 −0 build/vs/pjproject-vs14-win64-release-defaults.props
  15. +1 −1 configure-android
  16. +427 −0 pjlib-util/build/pjlib_util.vcxproj
  17. +182 −0 pjlib-util/build/pjlib_util.vcxproj.filters
  18. +428 −0 pjlib-util/build/pjlib_util_test.vcxproj
  19. +51 −0 pjlib-util/build/pjlib_util_test.vcxproj.filters
  20. +25 −25 pjlib-util/src/pjlib-util-test/http_client.c
  21. +5 −1 pjlib-util/src/pjlib-util/cli_telnet.c
  22. +10 −3 pjlib-util/src/pjlib-util/dns.c
  23. +2 −2 pjlib-util/src/pjlib-util/dns_dump.c
  24. +1 −2 pjlib-util/src/pjlib-util/resolver.c
  25. +11 −11 pjlib-util/src/pjlib-util/srv_resolver.c
  26. +5 −5 pjlib-util/src/pjlib-util/stun_simple.c
  27. +18 −2 pjlib-util/src/pjlib-util/xml.c
  28. +687 −0 pjlib/build/pjlib.vcxproj
  29. +425 −0 pjlib/build/pjlib.vcxproj.filters
  30. +432 −0 pjlib/build/pjlib_test.vcxproj
  31. +129 −0 pjlib/build/pjlib_test.vcxproj.filters
  32. +4 −1 pjlib/include/pj/compat/os_auto.h.in
  33. +3 −3 pjlib/include/pj/config.h
  34. +34 −1 pjlib/include/pj/ioqueue.h
  35. +40 −1 pjlib/include/pj/ssl_sock.h
  36. +5 −1 pjlib/include/pj/string_i.h
  37. +6 −6 pjlib/src/pj/errno.c
  38. +117 −0 pjlib/src/pj/guid_android.c
  39. +47 −14 pjlib/src/pj/ioqueue_common_abs.c
  40. +52 −39 pjlib/src/pj/ioqueue_epoll.c
  41. +61 −40 pjlib/src/pj/ioqueue_select.c
  42. +3 −3 pjlib/src/pj/os_core_unix.c
  43. +2 −2 pjlib/src/pj/pool_caching.c
  44. +27 −1 pjlib/src/pj/ssl_sock_common.c
  45. +73 −30 pjlib/src/pj/ssl_sock_ossl.c
  46. +2 −2 pjlib/src/pjlib-test/ioq_perf.c
  47. +7 −7 pjlib/src/pjlib-test/ioq_udp.c
  48. +6 −6 pjlib/src/pjlib-test/pool.c
  49. +4 −4 pjlib/src/pjlib-test/pool_perf.c
  50. +6 −4 pjlib/src/pjlib-test/ssl_sock.c
  51. +6 −5 pjlib/src/pjlib-test/timer.c
  52. +5 −5 pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c
  53. +12 −12 pjmedia/build/Makefile
  54. +34 −11 pjmedia/build/os-auto.mak.in
  55. +178 −162 pjmedia/build/pjmedia.vcproj
  56. +436 −0 pjmedia/build/pjmedia.vcxproj
  57. +398 −0 pjmedia/build/pjmedia.vcxproj.filters
  58. +401 −0 pjmedia/build/pjmedia_audiodev.vcxproj
  59. +65 −0 pjmedia/build/pjmedia_audiodev.vcxproj.filters
  60. +387 −0 pjmedia/build/pjmedia_codec.vcxproj
  61. +143 −0 pjmedia/build/pjmedia_codec.vcxproj.filters
  62. +434 −0 pjmedia/build/pjmedia_test.vcxproj
  63. +66 −0 pjmedia/build/pjmedia_test.vcxproj.filters
  64. +359 −0 pjmedia/build/pjmedia_videodev.vcxproj
  65. +56 −0 pjmedia/build/pjmedia_videodev.vcxproj.filters
  66. +5 −623 pjmedia/include/pjmedia-audiodev/audiodev.h
  67. +16 −9 pjmedia/include/pjmedia-audiodev/config.h
  68. +2 −1 pjmedia/include/pjmedia-codec.h
  69. +51 −1 pjmedia/include/pjmedia-codec/config.h
  70. +6 −1 pjmedia/include/pjmedia-codec/config_auto.h.in
  71. +155 −0 pjmedia/include/pjmedia-codec/opus.h
  72. +2 −1 pjmedia/include/pjmedia-codec/types.h
  73. +3 −3 pjmedia/include/pjmedia-videodev/config.h
  74. +4 −723 pjmedia/include/pjmedia-videodev/videodev.h
  75. +728 −0 pjmedia/include/pjmedia/audiodev.h
  76. +30 −1 pjmedia/include/pjmedia/config.h
  77. +51 −4 pjmedia/include/pjmedia/echo.h
  78. +62 −3 pjmedia/include/pjmedia/endpoint.h
  79. +17 −5 pjmedia/include/pjmedia/sound.h
  80. +3 −2 pjmedia/include/pjmedia/stream.h
  81. +14 −6 pjmedia/include/pjmedia/types.h
  82. +824 −0 pjmedia/include/pjmedia/videodev.h
  83. +2 −2 pjmedia/src/pjmedia-audiodev/android_jni_dev.c
  84. +43 −662 pjmedia/src/pjmedia-audiodev/audiodev.c
  85. +12 −3 pjmedia/src/pjmedia-audiodev/coreaudio_dev.m
  86. +2 −2 pjmedia/src/pjmedia-audiodev/opensl_dev.c
  87. +8 −1 pjmedia/src/pjmedia-codec/audio_codecs.c
  88. +14 −4 pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
  89. +35 −37 pjmedia/src/pjmedia-codec/ilbc.c
  90. +1,070 −0 pjmedia/src/pjmedia-codec/opus.c
  91. +19 −2 pjmedia/src/pjmedia-videodev/android_dev.c
  92. +5 −1 pjmedia/src/pjmedia-videodev/ios_dev.m
  93. +41 −718 pjmedia/src/pjmedia-videodev/videodev.c
  94. +628 −0 pjmedia/src/pjmedia/audiodev.c
  95. +2 −2 pjmedia/src/pjmedia/converter_libswscale.c
  96. +22 −1 pjmedia/src/pjmedia/echo_common.c
  97. +16 −1 pjmedia/src/pjmedia/echo_internal.h
  98. +371 −0 pjmedia/src/pjmedia/echo_webrtc.c
  99. +33 −24 pjmedia/src/pjmedia/endpoint.c
  100. +30 −43 pjmedia/src/pjmedia/ffmpeg_util.c
  101. +13 −3 pjmedia/src/pjmedia/ffmpeg_util.h
  102. +28 −8 pjmedia/src/pjmedia/sdp.c
  103. +6 −6 pjmedia/src/pjmedia/sdp_neg.c
  104. +2 −2 pjmedia/src/pjmedia/session.c
  105. +2 −17 pjmedia/src/pjmedia/sound_legacy.c
  106. +35 −11 pjmedia/src/pjmedia/stream.c
  107. +50 −1 pjmedia/src/pjmedia/stream_info.c
  108. +4 −4 pjmedia/src/pjmedia/tonegen.c
  109. +25 −8 pjmedia/src/pjmedia/transport_srtp.c
  110. +8 −3 pjmedia/src/pjmedia/vid_stream.c
  111. +699 −0 pjmedia/src/pjmedia/videodev.c
  112. +2 −4 pjmedia/src/pjmedia/wav_player.c
  113. +15 −15 pjmedia/src/test/codec_vectors.c
  114. +3 −3 pjmedia/src/test/mips_test.c
  115. +401 −0 pjnath/build/pjnath.vcxproj
  116. +119 −0 pjnath/build/pjnath.vcxproj.filters
  117. +394 −0 pjnath/build/pjnath_test.vcxproj
  118. +54 −0 pjnath/build/pjnath_test.vcxproj.filters
  119. +10 −1 pjnath/include/pjnath.h
  120. +7 −3 pjnath/include/pjnath/ice_strans.h
  121. +2 −2 pjnath/src/pjnath-test/server.c
  122. +9 −9 pjnath/src/pjnath-test/stun.c
  123. +22 −14 pjnath/src/pjnath/ice_session.c
Sorry, we could not display the entire diff because too many files (505) changed.
View
1 README.txt
@@ -463,6 +463,7 @@ Using Default Settings
$ ./configure --help
...
Optional Features:
+ --enable-epoll Use epoll on Linux instead of select
--disable-floating-point Disable floating point where possible
--disable-sound Exclude sound (i.e. use null sound)
--disable-small-filter Exclude small filter in resampling
View
350 aconfigure
@@ -622,7 +622,9 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
ac_main_obj
ac_host
-ac_linux_poll
+opus_present
+opus_h_present
+ac_no_opus
silk_present
silk_h_present
ac_no_silk
@@ -638,6 +640,8 @@ libcrypto_present
libssl_present
openssl_h_present
ac_no_ssl
+ac_webrtc_ldflags
+ac_webrtc_cflags
ac_libyuv_ldflags
ac_libyuv_cflags
ac_openh264_ldflags
@@ -683,6 +687,7 @@ ac_external_srtp
ac_external_gsm
ac_external_speex
ac_shared_libraries
+ac_linux_poll
ac_os_objs
EGREP
GREP
@@ -800,6 +805,8 @@ with_openh264
enable_openh264
with_libyuv
enable_libyuv
+with_webrtc
+enable_webrtc
enable_ipp
with_ipp
with_ipp_samples
@@ -812,6 +819,8 @@ with_opencore_amrwbenc
enable_opencore_amr
with_silk
enable_silk
+with_opus
+enable_opus
'
ac_precious_vars='build_alias
host_alias
@@ -1465,6 +1474,7 @@ Optional Features:
--disable-v4l2 Disable Video4Linux2 (default: not disabled)
--disable-openh264 Disable OpenH264 (default: not disabled)
--disable-libyuv Exclude libyuv in the build
+ --disable-webrtc Exclude webrtc in the build
--enable-ipp Enable Intel IPP support. Specify the Intel IPP
package and samples location using IPPROOT and
IPPSAMPLES env var or with --with-ipp and
@@ -1477,6 +1487,9 @@ Optional Features:
--disable-silk Exclude SILK support from the build (default:
autodetect)
+ --disable-opus Exclude OPUS support from the build (default:
+ autodetect)
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1505,6 +1518,7 @@ Optional Packages:
--with-ffmpeg=DIR Specify alternate FFMPEG prefix
--with-openh264=DIR Specify alternate OpenH264 prefix
--with-libyuv=DIR Specify alternate libyuv prefix
+ --with-webrtc=DIR Specify alternate WebRtc prefix
--with-ipp=DIR Specify the Intel IPP location
--with-ipp-samples=DIR Specify the Intel IPP samples location
--with-ipp-arch=ARCH Specify the Intel IPP ARCH suffix, e.g. "64" or
@@ -1517,6 +1531,7 @@ Optional Packages:
--with-opencore-amrwbenc=DIR
Specify alternate libvo-amrwbenc prefix
--with-silk=DIR Specify alternate SILK prefix
+ --with-opus=DIR Specify alternate OPUS prefix
Some influential environment variables:
CC C compiler command
@@ -1995,6 +2010,60 @@ $as_echo "$ac_res" >&6; }
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -2491,7 +2560,7 @@ test -n "$target_alias" &&
program_prefix=${target_alias}-
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"
-ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-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/os-auto.mak third_party/build/portaudio/os-auto.mak"
+ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-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/os-auto.mak"
@@ -5666,6 +5735,7 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
$as_echo_n "checking ioqueue backend... " >&6; }
# Check whether --enable-epoll was given.
@@ -5674,12 +5744,16 @@ if test "${enable_epoll+set}" = set; then :
ac_os_objs=ioqueue_epoll.o
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
$as_echo "/dev/epoll" >&6; }
+ $as_echo "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
+
+ ac_linux_poll=epoll
else
ac_os_objs=ioqueue_select.o
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
$as_echo "select()" >&6; }
+ ac_linux_poll=select
fi
@@ -5713,11 +5787,18 @@ case $target in
;;
esac
# UUID
- if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
- ac_os_objs="$ac_os_objs guid_uuid.o"
- else
- ac_os_objs="$ac_os_objs guid_simple.o"
- fi
+ case $target in
+ *android*)
+ ac_os_objs="$ac_os_objs guid_android.o"
+ ;;
+ *)
+ if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+ ac_os_objs="$ac_os_objs guid_uuid.o"
+ else
+ ac_os_objs="$ac_os_objs guid_simple.o"
+ fi
+ ;;
+ esac
;;
esac
@@ -6081,13 +6162,13 @@ $as_echo "Checking sound device backend... AudioUnit" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5
$as_echo "Checking sound device backend... old coreaudio" >&6; }
else
- ac_pjmedia_snd=pa_darwinos
+ ac_pjmedia_snd=coreaudio
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5
$as_echo "Checking sound device backend... coreaudio" >&6; }
fi
;;
*cygwin* | *mingw*)
- ac_pjmedia_snd=pa_win32
+ ac_pjmedia_snd=win32
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5
$as_echo "Checking sound device backend... win32 sound" >&6; }
;;
@@ -6097,16 +6178,14 @@ $as_echo "Checking sound device backend... win32 sound" >&6; }
$as_echo "Checking sound device backend... null sound" >&6; }
;;
*)
- ac_pjmedia_snd=pa_unix
+ ac_pjmedia_snd=alsa
+ ac_pa_use_alsa=1
+
ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
if test "x$ac_cv_header_alsa_version_h" = xyes; then :
- ac_pa_use_alsa=1
-
- LIBS="$LIBS -lasound"
-
+ LIBS="$LIBS -lasound"
else
ac_pa_use_alsa=0
-
fi
@@ -7051,6 +7130,21 @@ fi
fi
+ ac_fn_c_check_type "$LINENO" "enum AVPixelFormat" "ac_cv_type_enum_AVPixelFormat" "#include <libavformat/avformat.h>
+
+"
+if test "x$ac_cv_type_enum_AVPixelFormat" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ENUM_AVPIXELFORMAT 1
+_ACEOF
+
+
+else
+ ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1"
+fi
+
+
LIBS="$LIBS $ac_ffmpeg_ldflags"
export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
@@ -7322,6 +7416,123 @@ fi
+
+# Check whether --with-webrtc was given.
+if test "${with_webrtc+set}" = set; then :
+ withval=$with_webrtc;
+else
+ with_webrtc=no
+
+fi
+
+
+if test "x$ac_cross_compile" != "x" -a "x$with_webrtc" = "xno"; then
+ enable_webrtc=no
+fi
+
+
+
+# Check whether --enable-webrtc was given.
+if test "${enable_webrtc+set}" = set; then :
+ enableval=$enable_webrtc; if test "$enable_webrtc" = "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if webrtc is disabled...yes" >&5
+$as_echo "Checking if webrtc is disabled...yes" >&6; }
+ fi
+else
+
+ if test "x$with_webrtc" != "xno" -a "x$with_webrtc" != "x"; then
+ WEBRTC_PREFIX=$with_webrtc
+ WEBRTC_CFLAGS="-I$WEBRTC_PREFIX/src"
+
+ case $target in
+ *-apple-darwin_ios*)
+ case $ARCH in
+ *arm*)
+ WEBRTC_CFLAGS="-DPJMEDIA_WEBRTC_AEC_USE_MOBILE=1 $WEBRTC_CFLAGS"
+ WEBRTC_LDFLAGS="-L$WEBRTC_PREFIX/src/out_ios/Release-iphoneos"
+ WEBRTC_LIBS="-laudio_processing_neon -lcommon_audio_neon"
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *mingw* | *cygw* | *win32* | *w32* | *darwin* | *linux* | *android*)
+ WEBRTC_LDFLAGS="-L$WEBRTC_PREFIX/src/out/Release"
+ WEBRTC_LIBS="-laudio_processing_sse2"
+ ;;
+ *)
+ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using webrtc prefix... $with_webrtc" >&5
+$as_echo "Using webrtc prefix... $with_webrtc" >&6; }
+ else
+ WEBRTC_CFLAGS=""
+ WEBRTC_LDFLAGS=""
+ fi
+
+ WEBRTC_LIBS="$WEBRTC_LIBS -laudio_processing -lcommon_audio -lsystem_wrappers"
+
+ SAVED_LIBS="$LIBS"
+ SAVED_LDFLAGS="$LDFLAGS"
+ SAVED_CFLAGS="$CFLAGS"
+
+ LIBS="$WEBRTC_LIBS $LIBS"
+ LDFLAGS="$WEBRTC_LDFLAGS $LDFLAGS"
+ CFLAGS="$WEBRTC_CFLAGS $CFLAGS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WebRtcAec_Process in -laudio_processing" >&5
+$as_echo_n "checking for WebRtcAec_Process in -laudio_processing... " >&6; }
+if ${ac_cv_lib_audio_processing_WebRtcAec_Process+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-laudio_processing
+ $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char WebRtcAec_Process ();
+int
+main ()
+{
+return WebRtcAec_Process ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_audio_processing_WebRtcAec_Process=yes
+else
+ ac_cv_lib_audio_processing_WebRtcAec_Process=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_processing_WebRtcAec_Process" >&5
+$as_echo "$ac_cv_lib_audio_processing_WebRtcAec_Process" >&6; }
+if test "x$ac_cv_lib_audio_processing_WebRtcAec_Process" = xyes; then :
+ ac_webrtc_cflags="-DPJMEDIA_HAS_WEBRTC_AEC=1 $WEBRTC_CFLAGS"
+ ac_webrtc_ldflags="$WEBRTC_LDFLAGS $WEBRTC_LIBS"
+
+else
+ LIBS="$SAVED_LIBS"
+ LDFLAGS="$SAVED_LDFLAGS"
+ CFLAGS="$SAVED_CFLAGS"
+
+fi
+
+
+fi
+
+
# Check whether --enable-ipp was given.
if test "${enable_ipp+set}" = set; then :
enableval=$enable_ipp;
@@ -7769,6 +7980,9 @@ fi
# Check whether --with-opencore-amrnb was given.
if test "${with_opencore_amrnb+set}" = set; then :
withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5
+else
+ true;
+
fi
@@ -8101,6 +8315,107 @@ $as_echo "SILK library found, SILK support enabled" >&6; }
fi
+if test "x$ac_cross_compile" != "x" -a "x$with_opus" = "xno"; then
+ enable_opus=no
+fi
+
+
+# Check whether --with-opus was given.
+if test "${with_opus+set}" = set; then :
+ withval=$with_opus;
+else
+ with_opus=no
+
+fi
+
+
+
+# Check whether --enable-opus was given.
+if test "${enable_opus+set}" = set; then :
+ enableval=$enable_opus;
+ if test "$enable_opus" = "no"; then
+ ac_no_opus=1
+ $as_echo "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OPUS support is disabled... yes" >&5
+$as_echo "Checking if OPUS support is disabled... yes" >&6; }
+ fi
+
+else
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OPUS installations.." >&5
+$as_echo "checking for OPUS installations.." >&6; }
+ if test "x$with_opus" != "xno" -a "x$with_opus" != "x"; then
+ CFLAGS="$CFLAGS -I$with_opus/include"
+ CPPFLAGS="$CPPFLAGS -I$with_opus/include"
+ LDFLAGS="$LDFLAGS -L$with_opus/lib"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OPUS prefix... $with_opus" >&5
+$as_echo "Using OPUS prefix... $with_opus" >&6; }
+ fi
+
+
+ ac_fn_c_check_header_mongrel "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
+if test "x$ac_cv_header_opus_opus_h" = xyes; then :
+ opus_h_present=1
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_repacketizer_get_size in -lopus" >&5
+$as_echo_n "checking for opus_repacketizer_get_size in -lopus... " >&6; }
+if ${ac_cv_lib_opus_opus_repacketizer_get_size+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lopus $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opus_repacketizer_get_size ();
+int
+main ()
+{
+return opus_repacketizer_get_size ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_opus_opus_repacketizer_get_size=yes
+else
+ ac_cv_lib_opus_opus_repacketizer_get_size=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_repacketizer_get_size" >&5
+$as_echo "$ac_cv_lib_opus_opus_repacketizer_get_size" >&6; }
+if test "x$ac_cv_lib_opus_opus_repacketizer_get_size" = xyes; then :
+ opus_present=1 && LIBS="$LIBS -lopus"
+fi
+
+ if test "x$opus_h_present" = "x1" -a "x$opus_present" = "x1"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OPUS library found, OPUS support enabled" >&5
+$as_echo "OPUS library found, OPUS support enabled" >&6; }
+ $as_echo "#define PJMEDIA_HAS_OPUS_CODEC 1" >>confdefs.h
+
+ else
+ ac_no_opus=1
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: OPUS library not found, OPUS support disabled" >&5
+$as_echo "OPUS library not found, OPUS support disabled" >&6; }
+ $as_echo "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
+
+ fi
+
+fi
+
+
@@ -8177,8 +8492,6 @@ esac
-ac_linux_poll=select
-
ac_host=unix
@@ -8896,7 +9209,6 @@ do
"pjmedia/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;;
"pjsip/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;;
"third_party/build/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;;
- "third_party/build/portaudio/os-auto.mak") CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
View
170 aconfigure.ac
@@ -19,7 +19,6 @@ AC_CONFIG_FILES([build.mak
pjmedia/build/os-auto.mak
pjsip/build/os-auto.mak
third_party/build/os-auto.mak
- third_party/build/portaudio/os-auto.mak
])
@@ -410,17 +409,21 @@ dnl ######################
dnl # ioqueue selection
dnl #
AC_SUBST(ac_os_objs)
+AC_SUBST(ac_linux_poll)
AC_MSG_CHECKING([ioqueue backend])
AC_ARG_ENABLE(epoll,
AC_HELP_STRING([--enable-epoll],
[Use /dev/epoll ioqueue on Linux (experimental)]),
[
ac_os_objs=ioqueue_epoll.o
AC_MSG_RESULT([/dev/epoll])
+ AC_DEFINE(PJ_HAS_LINUX_EPOLL,1)
+ ac_linux_poll=epoll
],
[
ac_os_objs=ioqueue_select.o
- AC_MSG_RESULT([select()])
+ AC_MSG_RESULT([select()])
+ ac_linux_poll=select
])
AC_SUBST(ac_shared_libraries)
@@ -451,11 +454,18 @@ case $target in
;;
esac
# UUID
- if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
- ac_os_objs="$ac_os_objs guid_uuid.o"
- else
- ac_os_objs="$ac_os_objs guid_simple.o"
- fi
+ case $target in
+ *android*)
+ ac_os_objs="$ac_os_objs guid_android.o"
+ ;;
+ *)
+ if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
+ ac_os_objs="$ac_os_objs guid_uuid.o"
+ else
+ ac_os_objs="$ac_os_objs guid_simple.o"
+ fi
+ ;;
+ esac
;;
esac
@@ -637,12 +647,12 @@ else
ac_pjmedia_snd=pa_old_darwinos
AC_MSG_RESULT([Checking sound device backend... old coreaudio])
else
- ac_pjmedia_snd=pa_darwinos
+ ac_pjmedia_snd=coreaudio
AC_MSG_RESULT([Checking sound device backend... coreaudio])
fi
;;
*cygwin* | *mingw*)
- ac_pjmedia_snd=pa_win32
+ ac_pjmedia_snd=win32
AC_MSG_RESULT([Checking sound device backend... win32 sound])
;;
*rtems*)
@@ -651,12 +661,11 @@ else
;;
*)
dnl # Check if ALSA is available
- ac_pjmedia_snd=pa_unix
+ ac_pjmedia_snd=alsa
+ AC_SUBST(ac_pa_use_alsa,1)
AC_CHECK_HEADER(alsa/version.h,
- [AC_SUBST(ac_pa_use_alsa,1)
- LIBS="$LIBS -lasound"
- ],
- [AC_SUBST(ac_pa_use_alsa,0)])
+ [LIBS="$LIBS -lasound"],
+ [ac_pa_use_alsa=0])
AC_MSG_RESULT([Checking sound device backend... unix])
dnl # Check if OSS is disabled
@@ -1088,6 +1097,12 @@ AC_ARG_ENABLE(ffmpeg,
fi
+ AC_CHECK_TYPES(enum AVPixelFormat,
+ [],
+ [ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1"],
+ [[#include <libavformat/avformat.h>]]
+ )
+
LIBS="$LIBS $ac_ffmpeg_ldflags"
export PKG_CONFIG_PATH=$SAVED_PKG_CONFIG_PATH
]
@@ -1256,6 +1271,82 @@ AC_ARG_ENABLE(libyuv,
])
+dnl # WebRtc alt prefix
+AC_ARG_WITH(webrtc,
+ AC_HELP_STRING([--with-webrtc=DIR],
+ [Specify alternate WebRtc prefix]),
+ [],
+ [with_webrtc=no]
+ )
+
+dnl # Do not use default webrtc installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_webrtc" = "xno"; then
+ enable_webrtc=no
+fi
+
+dnl # WebRtc
+AC_SUBST(ac_webrtc_cflags)
+AC_SUBST(ac_webrtc_ldflags)
+AC_ARG_ENABLE(webrtc,
+ AC_HELP_STRING([--disable-webrtc],
+ [Exclude webrtc in the build]),
+ [if test "$enable_webrtc" = "no"; then
+ AC_MSG_RESULT([Checking if webrtc is disabled...yes])
+ fi],
+ [
+ if test "x$with_webrtc" != "xno" -a "x$with_webrtc" != "x"; then
+ WEBRTC_PREFIX=$with_webrtc
+ WEBRTC_CFLAGS="-I$WEBRTC_PREFIX/src"
+
+ case $target in
+ *-apple-darwin_ios*)
+ case $ARCH in
+ *arm*)
+ WEBRTC_CFLAGS="-DPJMEDIA_WEBRTC_AEC_USE_MOBILE=1 $WEBRTC_CFLAGS"
+ WEBRTC_LDFLAGS="-L$WEBRTC_PREFIX/src/out_ios/Release-iphoneos"
+ WEBRTC_LIBS="-laudio_processing_neon -lcommon_audio_neon"
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *mingw* | *cygw* | *win32* | *w32* | *darwin* | *linux* | *android*)
+ WEBRTC_LDFLAGS="-L$WEBRTC_PREFIX/src/out/Release"
+ WEBRTC_LIBS="-laudio_processing_sse2"
+ ;;
+ *)
+ ;;
+ esac
+
+ AC_MSG_RESULT([Using webrtc prefix... $with_webrtc])
+ else
+ WEBRTC_CFLAGS=""
+ WEBRTC_LDFLAGS=""
+ fi
+
+ WEBRTC_LIBS="$WEBRTC_LIBS -laudio_processing -lcommon_audio -lsystem_wrappers"
+
+ SAVED_LIBS="$LIBS"
+ SAVED_LDFLAGS="$LDFLAGS"
+ SAVED_CFLAGS="$CFLAGS"
+
+ LIBS="$WEBRTC_LIBS $LIBS"
+ LDFLAGS="$WEBRTC_LDFLAGS $LDFLAGS"
+ CFLAGS="$WEBRTC_CFLAGS $CFLAGS"
+
+ AC_CHECK_LIB(audio_processing,
+ WebRtcAec_Process,
+ [ ac_webrtc_cflags="-DPJMEDIA_HAS_WEBRTC_AEC=1 $WEBRTC_CFLAGS"
+ ac_webrtc_ldflags="$WEBRTC_LDFLAGS $WEBRTC_LIBS"
+ ],
+ [ LIBS="$SAVED_LIBS"
+ LDFLAGS="$SAVED_LDFLAGS"
+ CFLAGS="$SAVED_CFLAGS"
+ ],
+ []
+ )
+ ])
+
dnl ########################################################
dnl # Intel IPP support
dnl #
@@ -1550,7 +1641,7 @@ AC_ARG_WITH(opencore-amrnb,
AC_HELP_STRING([--with-opencore-amrnb=DIR],
[This option is obsolete and replaced by --with-opencore-amr=DIR]),
[AC_MSG_ERROR(This option is obsolete and replaced by --with-opencore-amr=DIR)],
- []
+ [true;]
)
dnl # opencore-amr alt prefix
@@ -1684,6 +1775,54 @@ AC_ARG_ENABLE(silk,
fi
])
+dnl # Do not use default OPUS installation if we are cross-compiling
+if test "x$ac_cross_compile" != "x" -a "x$with_opus" = "xno"; then
+ enable_opus=no
+fi
+
+dnl # OPUS prefix
+AC_ARG_WITH(opus,
+ AC_HELP_STRING([--with-opus=DIR],
+ [Specify alternate OPUS prefix]),
+ [],
+ [with_opus=no]
+ )
+
+dnl # Include OPUS support
+AC_SUBST(ac_no_opus)
+AC_ARG_ENABLE(opus,
+ AC_HELP_STRING([--disable-opus],
+ [Exclude OPUS support from the build (default: autodetect)])
+ ,
+ [
+ if test "$enable_opus" = "no"; then
+ [ac_no_opus=1]
+ AC_DEFINE(PJMEDIA_HAS_OPUS_CODEC,0)
+ AC_MSG_RESULT([Checking if OPUS support is disabled... yes])
+ fi
+ ],
+ [
+ AC_MSG_RESULT([checking for OPUS installations..])
+ if test "x$with_opus" != "xno" -a "x$with_opus" != "x"; then
+ CFLAGS="$CFLAGS -I$with_opus/include"
+ CPPFLAGS="$CPPFLAGS -I$with_opus/include"
+ LDFLAGS="$LDFLAGS -L$with_opus/lib"
+ AC_MSG_RESULT([Using OPUS prefix... $with_opus])
+ fi
+ AC_SUBST(opus_h_present)
+ AC_SUBST(opus_present)
+ AC_CHECK_HEADER(opus/opus.h,[opus_h_present=1])
+ AC_CHECK_LIB(opus,opus_repacketizer_get_size,[opus_present=1 && LIBS="$LIBS -lopus"])
+ if test "x$opus_h_present" = "x1" -a "x$opus_present" = "x1"; then
+ AC_MSG_RESULT([OPUS library found, OPUS support enabled])
+ AC_DEFINE(PJMEDIA_HAS_OPUS_CODEC,1)
+ else
+ [ac_no_opus=1]
+ AC_MSG_RESULT([OPUS library not found, OPUS support disabled])
+ AC_DEFINE(PJMEDIA_HAS_OPUS_CODEC,0)
+ fi
+ ])
+
dnl ##########################################
dnl #
@@ -1754,7 +1893,6 @@ esac
AC_SUBST(target)
-AC_SUBST(ac_linux_poll,select)
AC_SUBST(ac_host,unix)
AC_SUBST(ac_main_obj)
case $target in
View
34 build/vs/pjproject-vs14-common-defaults.props
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <VSVer>14</VSVer>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ <OutDir Condition="'$(TargetExt)'=='.lib'">..\lib\</OutDir>
+ <OutDir Condition="'$(TargetExt)'=='.exe'">..\bin\</OutDir>
+ <OutDir Condition="'$(TargetExt)'=='.dll'">..\lib\</OutDir>
+ <TargetName>$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ <IntDir>.\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level4</WarningLevel>
+ <CompileAs>Default</CompileAs>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ <Link>
+ <OutputFile>..\bin\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
View
21 build/vs/pjproject-vs14-debug-defaults.props
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-common-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
16 build/vs/pjproject-vs14-debug-dynamic-defaults.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-debug-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
16 build/vs/pjproject-vs14-debug-static-defaults.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-debug-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
18 build/vs/pjproject-vs14-release-defaults.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-common-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
16 build/vs/pjproject-vs14-release-dynamic-defaults.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-release-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
16 build/vs/pjproject-vs14-release-static-defaults.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-release-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
View
25 build/vs/pjproject-vs14-win32-common-defaults.props
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <TargetCPU>i386</TargetCPU>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;PJ_WIN32=1;PJ_M_I386=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="TargetCPU">
+ <Value>$(TargetCPU)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
View
12 build/vs/pjproject-vs14-win32-release-defaults.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-win32-common-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup />
+ <ItemGroup />
+</Project>
View
25 build/vs/pjproject-vs14-win64-common-defaults.props
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <TargetCPU>x86_64</TargetCPU>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>WIN64;PJ_WIN64=1;PJ_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="TargetCPU">
+ <Value>$(TargetCPU)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
View
12 build/vs/pjproject-vs14-win64-release-defaults.props
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="pjproject-vs14-win64-common-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <ItemDefinitionGroup />
+ <ItemGroup />
+</Project>
View
2 configure-android
@@ -107,7 +107,7 @@ if test "$1" = "--use-ndk-cflags"; then
# Make sure target host string has 'linux-android' in it
if test "x`echo ${TARGET_HOST} | grep 'linux-android'`" = "x"; then
#TARGET_HOST=`echo ${TARGET_HOST} | sed -e 's/\(.*\)\-\([0-9\.]*\)/\1-linux-android-\2/'`
- TARGET_HOST+=-linux-android
+ TARGET_HOST="${TARGET_HOST}-linux-android"
fi
export CC="${NDK_CC}"
View
427 pjlib-util/build/pjlib_util.vcxproj
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug-Dynamic|Win32">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Dynamic|x64">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|Win32">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|x64">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|Win32">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|x64">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|Win32">
+ <Configuration>Release-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|x64">
+ <Configuration>Release-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}</ProjectGuid>
+ <RootNamespace>pjlib_util</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ <TargetName>pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeaderOutputFile />
+ </ClCompile>
+ <Lib>
+ <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\src\pjlib-util\base64.c" />
+ <ClCompile Include="..\src\pjlib-util\cli.c" />
+ <ClCompile Include="..\src\pjlib-util\cli_console.c" />
+ <ClCompile Include="..\src\pjlib-util\cli_telnet.c" />
+ <ClCompile Include="..\src\pjlib-util\crc32.c" />
+ <ClCompile Include="..\src\pjlib-util\dns.c" />
+ <ClCompile Include="..\src\pjlib-util\dns_dump.c" />
+ <ClCompile Include="..\src\pjlib-util\dns_server.c" />
+ <ClCompile Include="..\src\pjlib-util\errno.c" />
+ <ClCompile Include="..\src\pjlib-util\getopt.c" />
+ <ClCompile Include="..\src\pjlib-util\hmac_md5.c" />
+ <ClCompile Include="..\src\pjlib-util\hmac_sha1.c" />
+ <ClCompile Include="..\src\pjlib-util\http_client.c" />
+ <ClCompile Include="..\src\pjlib-util\json.c" />
+ <ClCompile Include="..\src\pjlib-util\md5.c" />
+ <ClCompile Include="..\src\pjlib-util\pcap.c" />
+ <ClCompile Include="..\src\pjlib-util\resolver.c" />
+ <ClCompile Include="..\src\pjlib-util\scanner.c" />
+ <ClCompile Include="..\src\pjlib-util\scanner_cis_bitwise.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\scanner_cis_uint.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\sha1.c" />
+ <ClCompile Include="..\src\pjlib-util\srv_resolver.c" />
+ <ClCompile Include="..\src\pjlib-util\string.c" />
+ <ClCompile Include="..\src\pjlib-util\stun_simple.c" />
+ <ClCompile Include="..\src\pjlib-util\stun_simple_client.c" />
+ <ClCompile Include="..\src\pjlib-util\symbols.c" />
+ <ClCompile Include="..\src\pjlib-util\xml.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\include\pjlib-util.h" />
+ <ClInclude Include="..\include\pjlib-util\base64.h" />
+ <ClInclude Include="..\include\pjlib-util\cli.h" />
+ <ClInclude Include="..\include\pjlib-util\cli_console.h" />
+ <ClInclude Include="..\include\pjlib-util\cli_imp.h" />
+ <ClInclude Include="..\include\pjlib-util\cli_telnet.h" />
+ <ClInclude Include="..\include\pjlib-util\config.h" />
+ <ClInclude Include="..\include\pjlib-util\crc32.h" />
+ <ClInclude Include="..\include\pjlib-util\dns.h" />
+ <ClInclude Include="..\include\pjlib-util\dns_server.h" />
+ <ClInclude Include="..\include\pjlib-util\errno.h" />
+ <ClInclude Include="..\include\pjlib-util\getopt.h" />
+ <ClInclude Include="..\include\pjlib-util\hmac_md5.h" />
+ <ClInclude Include="..\include\pjlib-util\hmac_sha1.h" />
+ <ClInclude Include="..\include\pjlib-util\http_client.h" />
+ <ClInclude Include="..\include\pjlib-util\json.h" />
+ <ClInclude Include="..\include\pjlib-util\md5.h" />
+ <ClInclude Include="..\include\pjlib-util\pcap.h" />
+ <ClInclude Include="..\include\pjlib-util\resolver.h" />
+ <ClInclude Include="..\include\pjlib-util\scanner.h" />
+ <ClInclude Include="..\include\pjlib-util\scanner_cis_bitwise.h" />
+ <ClInclude Include="..\include\pjlib-util\scanner_cis_uint.h" />
+ <ClInclude Include="..\include\pjlib-util\sha1.h" />
+ <ClInclude Include="..\include\pjlib-util\srv_resolver.h" />
+ <ClInclude Include="..\include\pjlib-util\string.h" />
+ <ClInclude Include="..\include\pjlib-util\stun_simple.h" />
+ <ClInclude Include="..\include\pjlib-util\types.h" />
+ <ClInclude Include="..\include\pjlib-util\xml.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
View
182 pjlib-util/build/pjlib_util.vcxproj.filters
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{619e66d9-efb3-437b-81c3-03a53da5cf1e}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{09de463c-0755-42b6-b6d9-37fd1fc54a4e}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\src\pjlib-util\base64.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\cli.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\cli_console.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\cli_telnet.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\crc32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\dns.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\dns_dump.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\dns_server.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\errno.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\getopt.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\hmac_md5.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\hmac_sha1.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\http_client.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\json.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\md5.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\pcap.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\resolver.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\scanner.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\scanner_cis_bitwise.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\scanner_cis_uint.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\sha1.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\srv_resolver.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\string.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\stun_simple.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\stun_simple_client.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\symbols.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\pjlib-util\xml.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\include\pjlib-util\base64.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\cli.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\cli_console.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\cli_imp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\cli_telnet.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\crc32.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\dns.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\dns_server.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\errno.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\hmac_md5.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\hmac_sha1.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\http_client.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\json.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\md5.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\pcap.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\resolver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\scanner.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\scanner_cis_bitwise.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\scanner_cis_uint.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\sha1.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\srv_resolver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\string.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\stun_simple.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\types.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\include\pjlib-util\xml.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
View
428 pjlib-util/build/pjlib_util_test.vcxproj
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug-Dynamic|Win32">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Dynamic|x64">
+ <Configuration>Debug-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|Win32">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug-Static|x64">
+ <Configuration>Debug-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|Win32">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Dynamic|x64">
+ <Configuration>Release-Dynamic</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|Win32">
+ <Configuration>Release-Static</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release-Static|x64">
+ <Configuration>Release-Static</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid>
+ <RootNamespace>pjlib_util_test</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v140</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+ <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
+ <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">